Update SCTK to latest develop with debian updates

Updates SCTK to latest develop with aboutcode-org/scancode-toolkit#3682 to have debian package releated improvements and also regen related test fixtures. Signed-off-by: Ayan Sinha Mahapatra <[email protected]>
aboutcode-org · Mar 1, 2024 · cf5ee4d · cf5ee4d
1 parent 43d6e46
commit cf5ee4d
Show file tree

Hide file tree

Showing 59 changed files with 3,227 additions and 1,861 deletions.
diff --git a/minecode/tests/testfiles/bower/expected_mapper_example1_bower.json b/minecode/tests/testfiles/bower/expected_mapper_example1_bower.json
@@ -47,17 +47,20 @@
     "license_detections":[
       {
         "license_expression":"bsd-new",
+        "license_expression_spdx":"BSD-3-Clause",
         "matches":[
           {
-            "score":100.0,
+            "license_expression":"bsd-new",
+            "spdx_license_expression":"BSD-3-Clause",
+            "from_file":null,
             "start_line":1,
             "end_line":1,
+            "matcher":"1-hash",
+            "score":100.0,
             "matched_length":1,
             "match_coverage":100.0,
-            "matcher":"1-hash",
-            "license_expression":"bsd-new",
-            "rule_identifier":"bsd-new_1135.RULE",
             "rule_relevance":100,
+            "rule_identifier":"bsd-new_1135.RULE",
             "rule_url":"https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/bsd-new_1135.RULE",
             "matched_text":"NewBSD"
           }

diff --git a/minecode/tests/testfiles/cpan/expected_json_cpanmapper.json b/minecode/tests/testfiles/cpan/expected_json_cpanmapper.json
@@ -39,17 +39,20 @@
     "license_detections":[
       {
         "license_expression":"mit",
+        "license_expression_spdx":"MIT",
         "matches":[
           {
-            "score":100.0,
+            "license_expression":"mit",
+            "spdx_license_expression":"MIT",
+            "from_file":null,
             "start_line":1,
             "end_line":1,
+            "matcher":"1-spdx-id",
+            "score":100.0,
             "matched_length":1,
             "match_coverage":100.0,
-            "matcher":"1-spdx-id",
-            "license_expression":"mit",
-            "rule_identifier":"spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_relevance":100,
+            "rule_identifier":"spdx-license-identifier-mit-1b937028f397e2c5fe4eb6a0abd781ab80f9eeff",
             "rule_url":null,
             "matched_text":"mit"
           }