Merge branch '4190-license-licence' into improve-maven-license

Author: pombredanne

.github/ISSUE_TEMPLATE/--doc-report.md

@@ -1,8 +1,8 @@
 ---
-name: "Documentation Improvement"
+name: Documentation Improvement
 about: Your suggestions for improving the scancode-toolkit Documentation.
 title: ''
-labels: 'documentation'
+labels: documentation
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/new-license-request.md

@@ -0,0 +1,20 @@
+---
+name: New License Request
+about: Request a new license for scancode detection purposes
+title: 'New license request: '
+labels: new-license
+assignees: DennisClark
+
+---
+
+**License Name**
+The full name of the license, preferably as provided by the original authors.
+
+**License Homepage URL**
+The primary and/or most reliable URL that contains the text of this license and/or information about it. This is ideally a web page dedicated to the license, but it may also be a source file that contains the license text.
+
+**Reference URLs**
+Optionally provide URLs that contain references to the license.
+ 
+**License Notes**
+Optionally describe any aspects of the license that deserve special attention.

.github/workflows/about-files-ci.yml

@@ -7,16 +7,16 @@ permissions:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.9]
+        python-version: [3.11]
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4

CHANGELOG.rst

@@ -1,15 +1,15 @@
 Changelog
 =========
 
-v33.0.0 (next next, roadmap)
-----------------------------
-
 - We now support new package manifest formats:
 
   - OpenWRT packages.
   - Yocto/BitBake .bb recipes.
 
 
+v33.0.0 (next next, roadmap)
+----------------------------
+
 - Fallback packages for non-native dependencies of SCTK.
 - Dependencies for
 - Support for copyright detection objects.
@@ -26,9 +26,14 @@ v33.0.0 (next next, roadmap)
 
 - `--unknown-licenses` is removed and this is always enabled
   and only used in case of improper detections automatically.
-  Also tag all license rules with required phrases to improve
-  license detection and reduce false positives.
-  See https://github.com/nexB/scancode-toolkit/issues/3300
+
+- All license rules have been tagged with required phrases to improve detection accuracy
+  and reduce false positives. See https://github.com/nexB/scancode-toolkit/issues/3300
+
+- Equivalent words like license and licence, as well as plurals are now treated as the same in
+  license detection. With this, many redundant rules have been deprecated.
+
+- The license detection accuracy of Maven POMS has been improved fixing corner cases.
 
 - File categorization support added, a post scan plugin tagging
   files with priority levels for review, and also take advantage
@@ -41,6 +46,7 @@ v33.0.0 (next next, roadmap)
 - Update ABOUT files to adapt the ABOUT File Specification.
   See https://github.com/aboutcode-org/scancode-toolkit/issues/4181
 
+
 v32.3.3 - 2025-03-06
 --------------------
 

azure-pipelines.yml

@@ -14,7 +14,7 @@ jobs:
     - template: etc/ci/azure-posix.yml
       parameters:
           job_name: core_tests
-          image_name: ubuntu-20.04
+          image_name: ubuntu-24.04
           python_versions: ['3.10']
           test_suites:
               misc_and_scancode: |
@@ -197,8 +197,8 @@ jobs:
 
     - template: etc/ci/azure-posix.yml
       parameters:
-          job_name: ubuntu20_test_all_supported_click_versions
-          image_name: ubuntu-20.04
+          job_name: ubuntu22_test_all_supported_click_versions
+          image_name: ubuntu-22.04
           python_versions: ['3.9', '3.10', '3.11', '3.12']
           python_architecture: x64
           test_suites:
@@ -225,8 +225,8 @@ jobs:
 
     - template: etc/ci/azure-posix.yml
       parameters:
-          job_name: ubuntu20_cpython_latest_from_pip
-          image_name: ubuntu-20.04
+          job_name: ubuntu24_cpython_latest_from_pip
+          image_name: ubuntu-24.04
           python_versions: ['3.9', '3.10', '3.11', '3.12']
           test_suites:
               all: venv/bin/pip install --upgrade-strategy eager --force-reinstall --upgrade -e .[testing] && venv/bin/pytest -n 2 -vvs tests/scancode/test_cli.py

src/licensedcode/data/rules/autosar-proprietary_1.RULE

@@ -0,0 +1,9 @@
+---
+license_expression: proprietary-license
+is_license_reference: yes
+
+ignorable_urls:
+ - https://www.autosar.org/fileadmin/standards/R22-11/FO/AUTOSAR_PRS_SOMEIPProtocol.pdf
+---
+{{ https://www.autosar.org/fileadmin/standards/R22-11/FO/AUTOSAR_PRS_SOMEIPProtocol.pdf }}
+

src/licensedcode/data/rules/autosar-proprietary_2.RULE

@@ -0,0 +1,8 @@
+---
+license_expression: proprietary-license
+is_license_reference: yes
+ignorable_urls:
+ - https://www.autosar.org/fileadmin/standards/R22-11/FO/AUTOSAR_PRS_SOMEIPServiceDiscoveryProtocol.pdf
+---
+{{ https://www.autosar.org/fileadmin/standards/R22-11/FO/AUTOSAR_PRS_SOMEIPServiceDiscoveryProtocol.pdf }}
+

src/licensedcode/data/rules/cc-by-3.0_and_mit_3.RULE

@@ -8,4 +8,4 @@ ignorable_urls:
 ---
 
 ## Copyright and license
-licensed under a Creative Commons Attribution 3.0 Unported (CC BY 3.0)  (https://creativecommons.org/licenses/by/3.0/) and MIT License - https://opensource.org/licenses/mit-license.html.
+licensed under a {{Creative Commons Attribution 3.0 Unported}} ({{CC BY 3.0}})  (https://creativecommons.org/licenses/by/3.0/) and {{MIT License}} - {{https://opensource.org/licenses/mit-license.html}}.

src/licensedcode/data/rules/cc-by-sa-4.0_44.RULE

@@ -7,4 +7,4 @@ ignorable_urls:
 ---
 
 This work is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/">
-{{Creative Commons Attribution-ShareAlike 4.0 International License}}</a>.
+{{Creative Commons Attribution-ShareAlike 4.0 International License}}</a>.

src/licensedcode/data/rules/chillicream-1.0_1.RULE

@@ -0,0 +1,51 @@
+---
+license_expression: chillicream-1.0
+is_license_text: yes
+minimum_coverage: 90
+notes: this was previously the proprietary-license_1023.RULE
+---
+
+{{ChilliCream License 1.0}}
+
+This is the license we use for our proprietary software like Banana Cake Pop.
+Acceptance
+
+By using the software, you agree to all of the terms and conditions below.
+Copyright License
+
+The licensor grants you a non-exclusive, royalty-free, worldwide, non-sublicensable, non-transferable license to use, copy, distribute, make available, and prepare derivative works of the software, in each case subject to the limitations and conditions below.
+Limitations
+
+You may not move, change, disable, or circumvent the license key functionality in the software, and you may not remove or obscure any functionality in the software that is protected by the license key.
+
+You may not alter, remove, or obscure any licensing, copyright, or other notices of the licensor in the software. Any use of the licensor’s trademarks is subject to applicable law.
+Patents
+
+The licensor grants you a license, under any patent claims the licensor can license, or becomes able to license, to make, have made, use, sell, offer for sale, import and have imported the software, in each case subject to the limitations and conditions in this license. This license does not cover any patent claims that you cause to be infringed by modifications or additions to the software. If you or your company make any written claim that the software infringes or contributes to infringement of any patent, your patent license for the software granted under these terms ends immediately. If your company makes such a claim, your patent license ends immediately for work on behalf of your company.
+Notices
+
+You must ensure that anyone who gets a copy of any part of the software from you also gets a copy of these terms.
+
+If you modify the software, you must include in any modified copies of the software prominent notices stating that you have modified the software.
+No Other Rights
+
+These terms do not imply any licenses other than those expressly granted in these terms.
+Termination
+
+If you use the software in violation of these terms, such use is not licensed, and your licenses will automatically terminate. If the licensor provides you with a notice of your violation, and you cease all violation of this license no later than 30 days after you receive that notice, your licenses will be reinstated retroactively. However, if you violate these terms after such reinstatement, any additional violation of these terms will cause your licenses to terminate automatically and permanently.
+No Liability
+
+As far as the law allows, the software comes as is, without any warranty or condition, and the licensor will not be liable to you for any damages arising out of these terms or the use or nature of the software, under any kind of legal claim.
+Definitions
+
+The licensor is the entity offering these terms, and the software is the software the licensor makes available under these terms, including any portion of it.
+
+you refers to the individual or entity agreeing to these terms.
+
+your company is any legal entity, sole proprietorship, or other kind of organization that you work for, plus all organizations that have control over, are under the control of, or are under common control with that organization. control means ownership of substantially all the assets of an entity, or the power to direct its management and policies by vote, contract, or otherwise. Control can be direct or indirect.
+
+your licenses are all the licenses granted to you for the software under these terms.
+
+use means anything you do with the software requiring one of your licenses.
+
+trademark means trademarks, service marks, and similar rights.