jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-01-18 05:18:24 +02:00
Code Issues Releases Activity

Fix compatibility feature

Browse Source
This commit is contained in:
Sven Merk 2019-03-06 15:33:19 +01:00
parent fa33f1925c
commit 4344f279fa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/sap/piper/ConfigurationHelper.groovy
View File

@ -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')

2
vars/whitesourceExecuteScan.groovy
View File

@ -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')