Skip to content

Commit 13712a0

Browse files
authored
adopt sorting in sql to stabilize result (#354)
* sort for normalizedLicense first and then for effectiveNormalizedLicense (sorting should be more stable in case of (multi)license selection changes * Update release notes
1 parent a8d71ac commit 13712a0

4 files changed

Lines changed: 6 additions & 4 deletions

File tree

core/src/main/resources/com/devonfw/tools/solicitor/sql/allden_normalizedlicenses.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ order by
2626
UPPER("groupId"),
2727
UPPER("artifactId"),
2828
UPPER("version"),
29-
UPPER("effectiveNormalizedLicense"),
3029
UPPER("normalizedLicense"),
30+
UPPER("effectiveNormalizedLicense"),
3131
UPPER("declaredLicense")

core/src/main/resources/com/devonfw/tools/solicitor/sql/normalizedlicenses_aggregated_applications.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,6 @@ order by
118118
UPPER("groupId"),
119119
UPPER("artifactId"),
120120
UPPER("version"),
121-
UPPER("effectiveNormalizedLicense"),
122121
UPPER("normalizedLicense"),
122+
UPPER("effectiveNormalizedLicense"),
123123
UPPER("applicationName")

core/src/main/resources/com/devonfw/tools/solicitor/sql/ossden_normalizedlicenses.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ order by
2626
UPPER("groupId"),
2727
UPPER("artifactId"),
2828
UPPER("version"),
29-
UPPER("effectiveNormalizedLicense"),
30-
UPPER("normalizedLicense")
29+
UPPER("normalizedLicense"),
30+
UPPER("effectiveNormalizedLicense")

documentation/master-solicitor.asciidoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2029,6 +2029,8 @@ Changes in 1.47.0::
20292029
* https://github.com/devonfw/solicitor/issues/348: Support worksheet protection in reports generated by the `ExcelWriter`. See <<Excel sheet protection against unwanted manual changes>>.
20302030
* https://github.com/devonfw/solicitor/issues/350: Better support conditional formatting and data validation in the `ExcelWriter`. Conditional Formatting and Data Validations which apply to cells/rows which get copied when expanding the template are now also extended to the newly created rows.
20312031
* https://github.com/devonfw/solicitor/pull/352: Enable use of templating placeholders in the `ExcelWriter` also in formula cells. This also facilitates to avoid a performance issue which might arise from using hyperlink cells in the template rows in XLS templates. See <<Using Placeholders in Excel Spreadsheets>>.
2032+
* https://github.com/devonfw/solicitor/pull/354: Change sorting of results in SQL to first sort by normalizedLicense and then by
2033+
effectiveNormalizedLicense. This should make reports more stable in case that LicenseSelection- or MultiLicenseSelection-rules are changed.
20322034

20332035
Changes in 1.46.0::
20342036
* https://github.com/devonfw/solicitor/issues/268: When creating reports in "delta mode" (i.e. with including information in changed data compared to a previous run) any data rows that were deleted might now also be included in the report. See <<Determining difference to previously stored model>> and <<Writers>>.

0 commit comments

Comments
 (0)