diff --git a/src/com/sap/piper/ConfigurationHelper.groovy b/src/com/sap/piper/ConfigurationHelper.groovy index f13436fe1..e6abb255f 100644 --- a/src/com/sap/piper/ConfigurationHelper.groovy +++ b/src/com/sap/piper/ConfigurationHelper.groovy @@ -49,7 +49,7 @@ class ConfigurationHelper implements Serializable { final ConfigurationHelper mixin(Map parameters, Set filter = null, Map compatibleParameters = [:]){ if (parameters.size() > 0 && compatibleParameters.size() > 0) { - parameters = ConfigurationMerger.merge(handleCompatibility(compatibleParameters, parameters), null, parameters) + parameters = ConfigurationMerger.merge(handleCompatibility(compatibleParameters, parameters, config), null, parameters) } if (filter) { filter.add('collectTelemetryData') diff --git a/vars/whitesourceExecuteScan.groovy b/vars/whitesourceExecuteScan.groovy index 99ac6f2a3..051f4544e 100644 --- a/vars/whitesourceExecuteScan.groovy +++ b/vars/whitesourceExecuteScan.groovy @@ -193,7 +193,7 @@ void call(Map parameters = [:]) { .mixin([ style : libraryResource('piper-os.css') ]) - .mixin(parameters, PARAMETER_KEYS) + .mixin(parameters, PARAMETER_KEYS, CONFIG_KEY_COMPATIBILITY) .dependingOn('scanType').mixin('buildDescriptorFile') .dependingOn('scanType').mixin('configFilePath') .dependingOn('scanType').mixin('dockerImage')