From 3bf3afd7acd69bd4fabef88f37e17d0d9dd37a61 Mon Sep 17 00:00:00 2001 From: Sven Merk Date: Mon, 4 Mar 2019 23:09:40 +0100 Subject: [PATCH] Added debug output --- src/com/sap/piper/integration/WhitesourceRepository.groovy | 5 ++++- vars/whitesourceExecuteScan.groovy | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/com/sap/piper/integration/WhitesourceRepository.groovy b/src/com/sap/piper/integration/WhitesourceRepository.groovy index 2eb1e64d6..3498d013d 100644 --- a/src/com/sap/piper/integration/WhitesourceRepository.groovy +++ b/src/com/sap/piper/integration/WhitesourceRepository.groovy @@ -234,6 +234,8 @@ class WhitesourceRepository implements Serializable { @NonCPS protected void fetchFileFromWhiteSource(String fileName, Map params) { + if(config.verbose) + script.echo "Entered routine to send file download request" handleAdditionalRequestParameters(params) def serializedContent = new JsonUtils().jsonToString(params) @@ -243,7 +245,8 @@ class WhitesourceRepository implements Serializable { script.sh "${config.verbose ? '' : '#!/bin/sh -e\n'}curl -o ${fileName} -X POST ${config.serviceUrl} -H 'Content-Type: application/json' -d \'${serializedContent}\'" } - private void handleAdditionalRequestParameters(params) { + @NonCPS + protected void handleAdditionalRequestParameters(params) { if(config.userKey) params["userKey"] = config.userKey } diff --git a/vars/whitesourceExecuteScan.groovy b/vars/whitesourceExecuteScan.groovy index 7dd674f61..1b35cb267 100644 --- a/vars/whitesourceExecuteScan.groovy +++ b/vars/whitesourceExecuteScan.groovy @@ -197,6 +197,11 @@ private def triggerWhitesourceScanWithUserKey(script, config, utils, descriptorU statusCode = sh(script: "${javaCmd} ${options.join(' ')} ${config.agentParameters}", returnStatus: true) + if (config.jreDownloadUrl) { + sh "rm -r ./bin ./conf ./legal ./lib ./man" + javaCmd = './bin/java' + } + // archive whitesource result files archiveArtifacts artifacts: "whitesource/*.*", allowEmptyArchive: true }