From d60fc0242b69437df334bfb821317f53bcdad01b Mon Sep 17 00:00:00 2001 From: duph97 Date: Wed, 21 Feb 2024 17:34:25 +0100 Subject: [PATCH] License name mapping ordering (#233) * Apply convention for ordering of LicenseNameMapping rules * Add release note --- .../rules/LicenseNameMappingSample.xls | Bin 198656 -> 202752 bytes documentation/master-solicitor.asciidoc | 1 + 2 files changed, 1 insertion(+) diff --git a/core/src/main/resources/com/devonfw/tools/solicitor/rules/LicenseNameMappingSample.xls b/core/src/main/resources/com/devonfw/tools/solicitor/rules/LicenseNameMappingSample.xls index 97739828e8b2e2f6567fc9a0810010c66e665ff6..47d7eb40b83233a4dd8922a7b6935ec0ab57b9f9 100644 GIT binary patch delta 16063 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 ZKi^l;?lnArp+AH_7c1uV*w|Wg{R;y-Rs#S4 diff --git a/documentation/master-solicitor.asciidoc b/documentation/master-solicitor.asciidoc index 85ede1d8..bd4215bd 100644 --- a/documentation/master-solicitor.asciidoc +++ b/documentation/master-solicitor.asciidoc @@ -1668,6 +1668,7 @@ Spring beans implementing this interface will be called at certain points in the [appendix] == Release Notes Changes in 1.20.0:: +* https://github.com/devonfw/solicitor/issues/232: Set a standard for ordering LicenseNameMapping rules. Rules with an 'or-later' suffix are put before '-only' rules. Changes in 1.19.0:: * https://github.com/devonfw/solicitor/issues/227: Fixed a bug where the `dataStatus` field in the aggregated OSS-Inventory was not filled.