From 503edeedc8de2bee866e2d308ac5473b69f1d42e Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Tue, 11 Jun 2024 16:30:12 +0200 Subject: [PATCH] chore(model): Remove the unused `createMissingArchives` scanner option The condition that used that option was removed in c71628d, and there is no plan to reintroduce it as the current provenance-based scanner logic works differently. Signed-off-by: Sebastian Schuberth --- integrations/schemas/ort-configuration-schema.json | 3 --- model/src/main/kotlin/config/ScannerConfiguration.kt | 5 ----- model/src/main/resources/reference.yml | 2 -- model/src/test/kotlin/config/OrtConfigurationTest.kt | 2 -- .../src/funTest/assets/reporter-test-input.yml | 1 - .../opossum/src/funTest/assets/reporter-test-input.yml | 1 - .../static-html/src/funTest/assets/reporter-test-input.yml | 1 - .../funTest/assets/scan-result-for-synthetic-gradle-lib.yml | 1 - .../scanner-integration-all-pkgs-expected-ort-result.yml | 1 - .../scanner-integration-subset-pkgs-expected-ort-result.yml | 1 - 10 files changed, 18 deletions(-) diff --git a/integrations/schemas/ort-configuration-schema.json b/integrations/schemas/ort-configuration-schema.json index 5ef42c0327d67..39319c7b2bf03 100644 --- a/integrations/schemas/ort-configuration-schema.json +++ b/integrations/schemas/ort-configuration-schema.json @@ -198,9 +198,6 @@ "archive": { "$ref": "#/definitions/Archive" }, - "createMissingArchives": { - "type": "boolean" - }, "detectedLicenseMapping": { "$ref": "#/definitions/DetectedLicenseMapping" }, diff --git a/model/src/main/kotlin/config/ScannerConfiguration.kt b/model/src/main/kotlin/config/ScannerConfiguration.kt index 4c6295538cf9a..dedc38a1cbe64 100644 --- a/model/src/main/kotlin/config/ScannerConfiguration.kt +++ b/model/src/main/kotlin/config/ScannerConfiguration.kt @@ -49,11 +49,6 @@ data class ScannerConfiguration( */ val archive: FileArchiverConfiguration? = null, - /** - * Create archives for packages that have a stored scan result but no license archive yet. - */ - val createMissingArchives: Boolean = false, - /** * Mappings from licenses returned by the scanner to valid SPDX licenses. Note that these mappings are only applied * in new scans, stored scan results are not affected. diff --git a/model/src/main/resources/reference.yml b/model/src/main/resources/reference.yml index 196bb6d86ff54..36ae43dc79b00 100644 --- a/model/src/main/resources/reference.yml +++ b/model/src/main/resources/reference.yml @@ -198,8 +198,6 @@ ort: maximumPoolSize: 10 minimumIdle: 600000 - createMissingArchives: false - # Map scanner license findings to valid SPDX licenses. Note that these mappings are only applied in new scans, # stored scan results are not affected. detectedLicenseMapping: diff --git a/model/src/test/kotlin/config/OrtConfigurationTest.kt b/model/src/test/kotlin/config/OrtConfigurationTest.kt index 8feded6ff4b0c..b75ec58fdfcd5 100644 --- a/model/src/test/kotlin/config/OrtConfigurationTest.kt +++ b/model/src/test/kotlin/config/OrtConfigurationTest.kt @@ -221,8 +221,6 @@ class OrtConfigurationTest : WordSpec({ } } - createMissingArchives shouldBe false - detectedLicenseMapping shouldContainExactly mapOf( "BSD (Three Clause License)" to "BSD-3-clause", "LicenseRef-scancode-generic-cla" to "NOASSERTION" diff --git a/plugins/reporters/evaluated-model/src/funTest/assets/reporter-test-input.yml b/plugins/reporters/evaluated-model/src/funTest/assets/reporter-test-input.yml index a4028d7b88944..0c9d1923ccd06 100644 --- a/plugins/reporters/evaluated-model/src/funTest/assets/reporter-test-input.yml +++ b/plugins/reporters/evaluated-model/src/funTest/assets/reporter-test-input.yml @@ -387,7 +387,6 @@ scanner: tool_versions: {} config: skip_concluded: false - create_missing_archives: false detected_license_mapping: LicenseRef-scancode-agpl-generic-additional-terms: "NOASSERTION" LicenseRef-scancode-generic-cla: "NOASSERTION" diff --git a/plugins/reporters/opossum/src/funTest/assets/reporter-test-input.yml b/plugins/reporters/opossum/src/funTest/assets/reporter-test-input.yml index a4028d7b88944..0c9d1923ccd06 100644 --- a/plugins/reporters/opossum/src/funTest/assets/reporter-test-input.yml +++ b/plugins/reporters/opossum/src/funTest/assets/reporter-test-input.yml @@ -387,7 +387,6 @@ scanner: tool_versions: {} config: skip_concluded: false - create_missing_archives: false detected_license_mapping: LicenseRef-scancode-agpl-generic-additional-terms: "NOASSERTION" LicenseRef-scancode-generic-cla: "NOASSERTION" diff --git a/plugins/reporters/static-html/src/funTest/assets/reporter-test-input.yml b/plugins/reporters/static-html/src/funTest/assets/reporter-test-input.yml index a4028d7b88944..0c9d1923ccd06 100644 --- a/plugins/reporters/static-html/src/funTest/assets/reporter-test-input.yml +++ b/plugins/reporters/static-html/src/funTest/assets/reporter-test-input.yml @@ -387,7 +387,6 @@ scanner: tool_versions: {} config: skip_concluded: false - create_missing_archives: false detected_license_mapping: LicenseRef-scancode-agpl-generic-additional-terms: "NOASSERTION" LicenseRef-scancode-generic-cla: "NOASSERTION" diff --git a/plugins/reporters/web-app/src/funTest/assets/scan-result-for-synthetic-gradle-lib.yml b/plugins/reporters/web-app/src/funTest/assets/scan-result-for-synthetic-gradle-lib.yml index ed0fe32f8a989..7226d7d26b56a 100644 --- a/plugins/reporters/web-app/src/funTest/assets/scan-result-for-synthetic-gradle-lib.yml +++ b/plugins/reporters/web-app/src/funTest/assets/scan-result-for-synthetic-gradle-lib.yml @@ -198,7 +198,6 @@ scanner: tool_versions: {} config: skip_concluded: false - create_missing_archives: false detected_license_mapping: LicenseRef-scancode-agpl-generic-additional-terms: "NOASSERTION" LicenseRef-scancode-generic-cla: "NOASSERTION" diff --git a/scanner/src/funTest/assets/scanner-integration-all-pkgs-expected-ort-result.yml b/scanner/src/funTest/assets/scanner-integration-all-pkgs-expected-ort-result.yml index 5aab6ad8bdfc5..6b163eccd77e2 100644 --- a/scanner/src/funTest/assets/scanner-integration-all-pkgs-expected-ort-result.yml +++ b/scanner/src/funTest/assets/scanner-integration-all-pkgs-expected-ort-result.yml @@ -197,7 +197,6 @@ scanner: config: skip_concluded: false skip_excluded: false - create_missing_archives: false detected_license_mapping: LicenseRef-scancode-agpl-generic-additional-terms: "NOASSERTION" LicenseRef-scancode-free-unknown: "NOASSERTION" diff --git a/scanner/src/funTest/assets/scanner-integration-subset-pkgs-expected-ort-result.yml b/scanner/src/funTest/assets/scanner-integration-subset-pkgs-expected-ort-result.yml index 4ff01026e6357..f1627ba9c618e 100644 --- a/scanner/src/funTest/assets/scanner-integration-subset-pkgs-expected-ort-result.yml +++ b/scanner/src/funTest/assets/scanner-integration-subset-pkgs-expected-ort-result.yml @@ -116,7 +116,6 @@ scanner: config: skip_concluded: false skip_excluded: false - create_missing_archives: false detected_license_mapping: LicenseRef-scancode-agpl-generic-additional-terms: "NOASSERTION" LicenseRef-scancode-free-unknown: "NOASSERTION"