Skip to content

Commit b2aebfa

Browse files
committed
feat(scanner): Record the scanner tool versions in the ORT result
Resolves #4161. Signed-off-by: Sebastian Schuberth <[email protected]>
1 parent 0894374 commit b2aebfa

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

scanner/src/main/kotlin/Scanner.kt

+10-1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ import org.ossreviewtoolkit.scanner.provenance.NestedProvenanceScanResult
6565
import org.ossreviewtoolkit.scanner.provenance.PackageProvenanceResolver
6666
import org.ossreviewtoolkit.scanner.provenance.ProvenanceDownloader
6767
import org.ossreviewtoolkit.scanner.utils.FileListResolver
68+
import org.ossreviewtoolkit.utils.common.CommandLineTool
6869
import org.ossreviewtoolkit.utils.common.collectMessages
6970
import org.ossreviewtoolkit.utils.common.safeDeleteRecursively
7071
import org.ossreviewtoolkit.utils.ort.Environment
@@ -134,10 +135,18 @@ class Scanner(
134135

135136
val endTime = Instant.now()
136137

138+
val toolVersions = mutableMapOf<String, String>()
139+
140+
scannerWrappers.values.flatten().forEach { scanner ->
141+
if (scanner is CommandLineTool) {
142+
toolVersions[scanner.name] = scanner.getVersion()
143+
}
144+
}
145+
137146
val scannerRun = ScannerRun(
138147
startTime = startTime,
139148
endTime = endTime,
140-
environment = Environment(),
149+
environment = Environment(toolVersions = toolVersions),
141150
config = scannerConfig,
142151
provenances = projectResults.provenances + packageResults.provenances,
143152
scanResults = projectResults.scanResults + packageResults.scanResults,

0 commit comments

Comments
 (0)