From 0ffe5f2f4dcbba866315b05fe3b947fac5723f8d Mon Sep 17 00:00:00 2001 From: Vishal Chaudhary <102226698+vishalhcl-5960@users.noreply.github.com> Date: Mon, 22 Dec 2025 17:54:02 +0530 Subject: [PATCH 1/4] ASPL-1204 --- .../hcl/appscan/jenkins/plugin/builders/AppScanBuildStep.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/hcl/appscan/jenkins/plugin/builders/AppScanBuildStep.java b/src/main/java/com/hcl/appscan/jenkins/plugin/builders/AppScanBuildStep.java index 5257655e..51ad86d3 100644 --- a/src/main/java/com/hcl/appscan/jenkins/plugin/builders/AppScanBuildStep.java +++ b/src/main/java/com/hcl/appscan/jenkins/plugin/builders/AppScanBuildStep.java @@ -389,7 +389,8 @@ public IResultsProvider call() throws AbortException { label = Messages.label_asoc_homepage(); } - build.addAction(new ResultsRetriever(build, provider, resolver == null ? m_name : Util.replaceMacro(m_name, resolver), asocAppUrl, label)); + String reportName = properties.get(CoreConstants.SCAN_NAME); + build.addAction(new ResultsRetriever(build, provider, resolver == null ? reportName + SystemUtil.getTimeStamp() : Util.replaceMacro(reportName, resolver), asocAppUrl, label)); if(m_wait) shouldFailBuild(provider,build, progress); From 727a44f5e8d674d642301e21f29f9a41a9cf533f Mon Sep 17 00:00:00 2001 From: Vishal Chaudhary <102226698+vishalhcl-5960@users.noreply.github.com> Date: Tue, 3 Feb 2026 13:02:01 +0530 Subject: [PATCH 2/4] ASPL-1435 --- .../hcl/appscan/jenkins/plugin/builders/AppScanBuildStep.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/hcl/appscan/jenkins/plugin/builders/AppScanBuildStep.java b/src/main/java/com/hcl/appscan/jenkins/plugin/builders/AppScanBuildStep.java index 51ad86d3..8d0903a8 100644 --- a/src/main/java/com/hcl/appscan/jenkins/plugin/builders/AppScanBuildStep.java +++ b/src/main/java/com/hcl/appscan/jenkins/plugin/builders/AppScanBuildStep.java @@ -309,6 +309,7 @@ private void perform(Run build, Launcher launcher, TaskListener listener) t final IProgress progress = new ScanProgress(listener); final boolean suspend = m_wait; Map properties = getScanProperties(build,listener); + String reportName = properties.get(CoreConstants.SCAN_NAME); boolean isAppScan360 = ((JenkinsAuthenticationProvider) m_authProvider).isAppScan360(); m_scanner.validateSettings((JenkinsAuthenticationProvider) m_authProvider,properties, progress, isAppScan360); @@ -389,8 +390,7 @@ public IResultsProvider call() throws AbortException { label = Messages.label_asoc_homepage(); } - String reportName = properties.get(CoreConstants.SCAN_NAME); - build.addAction(new ResultsRetriever(build, provider, resolver == null ? reportName + SystemUtil.getTimeStamp() : Util.replaceMacro(reportName, resolver), asocAppUrl, label)); + build.addAction(new ResultsRetriever(build, provider, resolver == null ? reportName + "_" + SystemUtil.getTimeStamp() : Util.replaceMacro(reportName, resolver), asocAppUrl, label)); if(m_wait) shouldFailBuild(provider,build, progress); From b10b1a689c0755daa3b6619ac7da5582644d05a8 Mon Sep 17 00:00:00 2001 From: Vishal Chaudhary <102226698+vishalhcl-5960@users.noreply.github.com> Date: Fri, 20 Feb 2026 12:47:47 +0530 Subject: [PATCH 3/4] Copyright update --- .../hcl/appscan/jenkins/plugin/builders/AppScanBuildStep.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/hcl/appscan/jenkins/plugin/builders/AppScanBuildStep.java b/src/main/java/com/hcl/appscan/jenkins/plugin/builders/AppScanBuildStep.java index 8d0903a8..1d3c3bc1 100644 --- a/src/main/java/com/hcl/appscan/jenkins/plugin/builders/AppScanBuildStep.java +++ b/src/main/java/com/hcl/appscan/jenkins/plugin/builders/AppScanBuildStep.java @@ -1,6 +1,6 @@ /** * @ Copyright IBM Corporation 2016. - * @ Copyright HCL Technologies Ltd. 2017, 2025. + * @ Copyright HCL Technologies Ltd. 2017, 2026. * LICENSE: Apache License, Version 2.0 https://www.apache.org/licenses/LICENSE-2.0 */ @@ -390,6 +390,7 @@ public IResultsProvider call() throws AbortException { label = Messages.label_asoc_homepage(); } + //resolver is null for pipeline jobs, in that case we will append time stamp to report name build.addAction(new ResultsRetriever(build, provider, resolver == null ? reportName + "_" + SystemUtil.getTimeStamp() : Util.replaceMacro(reportName, resolver), asocAppUrl, label)); if(m_wait) From 789ac91326d983248cc02596131838be60a68a50 Mon Sep 17 00:00:00 2001 From: Vishal Chaudhary <102226698+vishalhcl-5960@users.noreply.github.com> Date: Fri, 20 Feb 2026 15:25:16 +0530 Subject: [PATCH 4/4] Update JenkinsUtil.java --- .../java/com/hcl/appscan/jenkins/plugin/util/JenkinsUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hcl/appscan/jenkins/plugin/util/JenkinsUtil.java b/src/main/java/com/hcl/appscan/jenkins/plugin/util/JenkinsUtil.java index c2f9b800..4722955c 100644 --- a/src/main/java/com/hcl/appscan/jenkins/plugin/util/JenkinsUtil.java +++ b/src/main/java/com/hcl/appscan/jenkins/plugin/util/JenkinsUtil.java @@ -12,7 +12,7 @@ public class JenkinsUtil { public static String getClientType() { - return "jenkins-" + SystemUtil.getOS() + "-" + getPluginVersion(); + return "jenkins-" + SystemUtil.getOSUpdated() + "-" + getPluginVersion(); } public static String getClientTypeUpdated() {