Skip to content

Fix MPL version in RabbitMQ Java client license rule #5387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
riturajarvind149 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix MPL version in RabbitMQ Java client license rule #5387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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``.
Expand Down
2 changes: 1 addition & 1 deletion ...s/mpl-1.1_or_gpl-2.0_or_apache-2.0_2.RULE → ...s/mpl-2.0_or_gpl-2.0_or_apache-2.0_1.RULE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
9 changes: 9 additions & 0 deletions tests/licensedcode/data/datadriven/lic1/rabbitmq-java-client-triple-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 2 additions & 0 deletions tests/licensedcode/data/datadriven/lic1/rabbitmq-java-client-triple-license.txt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
license_expressions:
- mpl-2.0 OR gpl-2.0 OR apache-2.0
Loading