diff --git a/AUTHORS.rst b/AUTHORS.rst index 9a8224dc7da..5195ef17fe0 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -75,6 +75,7 @@ The following organizations or individuals have contributed to ScanCode: - Richard Fontana @richardfontana - Richard Menzies @WizardOhio24 - Ritiek Malhotra @ritiek +- RITU RAJ ARVIND @riturajarvind149 - Rohit Potter @rpotter12 - Sankha Das @sankha555 - Saravanan G @SaravananOffl diff --git a/CHANGELOG.rst b/CHANGELOG.rst index abc3ae41ad2..419cb6b107d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -21,6 +21,11 @@ Next release ``json.JSONDecodeError`` in ``get_results_cache_data`` and returning an empty mapping. https://github.com/aboutcode-org/scancode-toolkit/issues/5345 +- Fix incorrect ``mpl-1.1`` expression in the RabbitMQ Java client triple-license + rule. The rule text declares "Mozilla Public License 2.0" but the expression was + ``mpl-1.1 OR gpl-2.0 OR apache-2.0``. Corrected to ``mpl-2.0 OR gpl-2.0 OR apache-2.0``. + https://github.com/aboutcode-org/scancode-toolkit/issues/5229 + - Cap ``pluggy`` below 1.7.0. pluggy 1.7.0 no longer accepts the class-based hookspecs used by ``plugincode`` and scancode fails at import time with ``ValueError: did not find any 'pre_scan' hooks``. diff --git a/src/licensedcode/data/rules/mpl-1.1_or_gpl-2.0_or_apache-2.0_2.RULE b/src/licensedcode/data/rules/mpl-2.0_or_gpl-2.0_or_apache-2.0_1.RULE similarity index 93% rename from src/licensedcode/data/rules/mpl-1.1_or_gpl-2.0_or_apache-2.0_2.RULE rename to src/licensedcode/data/rules/mpl-2.0_or_gpl-2.0_or_apache-2.0_1.RULE index 2d731dbdccb..644611aa7a6 100644 --- a/src/licensedcode/data/rules/mpl-1.1_or_gpl-2.0_or_apache-2.0_2.RULE +++ b/src/licensedcode/data/rules/mpl-2.0_or_gpl-2.0_or_apache-2.0_1.RULE @@ -1,5 +1,5 @@ --- -license_expression: mpl-1.1 OR gpl-2.0 OR apache-2.0 +license_expression: mpl-2.0 OR gpl-2.0 OR apache-2.0 is_license_notice: yes relevance: 100 referenced_filenames: diff --git a/tests/licensedcode/data/datadriven/lic1/rabbitmq-java-client-triple-license.txt b/tests/licensedcode/data/datadriven/lic1/rabbitmq-java-client-triple-license.txt new file mode 100644 index 00000000000..06cfd07b603 --- /dev/null +++ b/tests/licensedcode/data/datadriven/lic1/rabbitmq-java-client-triple-license.txt @@ -0,0 +1,9 @@ +This package, the RabbitMQ Java client library, is triple-licensed under +the Mozilla Public License 2.0 ("MPL"), the GNU General Public License +version 2 ("GPL") and the Apache License version 2 ("ASL"). For the MPL, +please see LICENSE-MPL-RabbitMQ. For the GPL, please see LICENSE-GPL2. +For the ASL, please see LICENSE-APACHE2. + +The RabbitMQ Java client library includes third-party software under the +ASL. For this license, please see LICENSE-APACHE2. For attribution of +copyright and other details of provenance, please refer to the source code. diff --git a/tests/licensedcode/data/datadriven/lic1/rabbitmq-java-client-triple-license.txt.yml b/tests/licensedcode/data/datadriven/lic1/rabbitmq-java-client-triple-license.txt.yml new file mode 100644 index 00000000000..6963d04fa20 --- /dev/null +++ b/tests/licensedcode/data/datadriven/lic1/rabbitmq-java-client-triple-license.txt.yml @@ -0,0 +1,2 @@ +license_expressions: + - mpl-2.0 OR gpl-2.0 OR apache-2.0