Skip to content

Commit

Permalink
chore(model): Remove the unused createMissingArchives scanner option
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
sschuberth committed Jun 12, 2024
1 parent 3b98c7d commit 503edee
Show file tree
Hide file tree
Showing 10 changed files with 0 additions and 18 deletions.
3 changes: 0 additions & 3 deletions integrations/schemas/ort-configuration-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,6 @@
"archive": {
"$ref": "#/definitions/Archive"
},
"createMissingArchives": {
"type": "boolean"
},
"detectedLicenseMapping": {
"$ref": "#/definitions/DetectedLicenseMapping"
},
Expand Down
5 changes: 0 additions & 5 deletions model/src/main/kotlin/config/ScannerConfiguration.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions model/src/main/resources/reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions model/src/test/kotlin/config/OrtConfigurationTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 503edee

Please sign in to comment.