diff --git a/plugins/commands/evaluator/src/main/kotlin/EvaluatorCommand.kt b/plugins/commands/evaluator/src/main/kotlin/EvaluatorCommand.kt index 0b2560b3c586..dab524fe03aa 100644 --- a/plugins/commands/evaluator/src/main/kotlin/EvaluatorCommand.kt +++ b/plugins/commands/evaluator/src/main/kotlin/EvaluatorCommand.kt @@ -297,10 +297,15 @@ class EvaluatorCommand : OrtCommand( val packageConfigurationProvider = CompositePackageConfigurationProvider(*enabledPackageConfigurationProviders.toTypedArray()) + ortResultInput = ortResultInput.setPackageConfigurations(packageConfigurationProvider) + val copyrightGarbage = copyrightGarbageFile.takeIf { it.isFile }?.readValue().orEmpty() val licenseInfoResolver = LicenseInfoResolver( - provider = DefaultLicenseInfoProvider(ortResultInput, packageConfigurationProvider), + provider = DefaultLicenseInfoProvider( + ortResult = ortResultInput, + packageConfigurationProvider = ortResultInput + ), copyrightGarbage = copyrightGarbage, addAuthorsToCopyrights = ortConfig.addAuthorsToCopyrights, archiver = ortConfig.scanner.archive.createFileArchiver(), @@ -325,7 +330,6 @@ class EvaluatorCommand : OrtCommand( // Note: This overwrites any existing EvaluatorRun from the input file. val ortResultOutput = ortResultInput.copy(evaluator = evaluatorRun) .mergeLabels(labels) - .setPackageConfigurations(packageConfigurationProvider) .setResolutions(resolutionProvider) outputDir?.let { absoluteOutputDir ->