jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-03-03 15:02:35 +02:00
Code Issues Releases Activity

Fix compatibility

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

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

@ -33,8 +33,8 @@ class ConfigurationHelper implements Serializable {
}
ConfigurationHelper mixinGeneralConfig(commonPipelineEnvironment, Set filter = null, Map compatibleParameters = [:]){
Map stepConfiguration = ConfigurationLoader.generalConfiguration([commonPipelineEnvironment: commonPipelineEnvironment])
return mixin(stepConfiguration, filter, compatibleParameters)
Map generalConfiguration = ConfigurationLoader.generalConfiguration([commonPipelineEnvironment: commonPipelineEnvironment])
return mixin(generalConfiguration, filter, compatibleParameters)
}
ConfigurationHelper mixinStageConfig(commonPipelineEnvironment, stageName, Set filter = null, Map compatibleParameters = [:]){
@ -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, config), null, parameters)
parameters = ConfigurationMerger.merge(handleCompatibility(compatibleParameters, parameters), null, parameters)
}
if (filter) {
filter.add('collectTelemetryData')

28
vars/whitesourceExecuteScan.groovy
View File

@ -148,21 +148,19 @@ import static com.sap.piper.Prerequisites.checkScript
@Field Set PARAMETER_KEYS = STEP_CONFIG_KEYS
@Field Map CONFIG_KEY_COMPATIBILITY = [
whitesource : [
orgAdminUserTokenCredentialsId : 'orgAdminUserTokenCredentialsId',
orgToken : 'orgToken',
productName : 'productName',
productVersion : 'productVersion',
productToken : 'productToken',
projectNames : 'projectNames',
scanType : 'scanType',
serviceUrl : 'serviceUrl',
userTokenCredentialsId : 'userTokenCredentialsId'
],
whitesourceUserTokenCredentialsId : 'userTokenCredentialsId',
whitesourceProductName : 'productName',
whitesourceProjectNames : 'projectNames',
whitesourceProductToken : 'productToken'
orgAdminUserTokenCredentialsId : 'whitesource.orgAdminUserTokenCredentialsId',
orgToken : 'whitesource.orgToken',
productName : 'whitesource.productName',
productVersion : 'whitesource.productVersion',
productToken : 'whitesource.productToken',
projectNames : 'whitesource.projectNames',
scanType : 'whitesource.scanType',
serviceUrl : 'whitesource.serviceUrl',
userTokenCredentialsId : 'whitesource.userTokenCredentialsId',
userTokenCredentialsId : 'whitesourceUserTokenCredentialsId',
productName : 'whitesourceProductName',
projectNames : 'whitesourceProjectNames',
productToken : 'whitesourceProductToken'
]
/**