From e5e1d5f20601efb7a63e7fe0f321edc0bb1d6553 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Thu, 1 May 2025 15:50:28 +0200 Subject: [PATCH] [Build] Use String.strip() instead of trim() This also reverts "Use trim() instead of strip() because Jenkins doesn't like it now." This reverts commit 0cc3c77cab0059ceab6ac8a3bda081542e8d8352. --- JenkinsJobs/Builds/build.jenkinsfile | 2 +- JenkinsJobs/Releng/publishToMaven.jenkinsfile | 4 ++-- JenkinsJobs/SmokeTests/StartSmokeTests.jenkinsfile | 2 +- Jenkinsfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/JenkinsJobs/Builds/build.jenkinsfile b/JenkinsJobs/Builds/build.jenkinsfile index 3fbb4708e5a..bbecf8d0857 100644 --- a/JenkinsJobs/Builds/build.jenkinsfile +++ b/JenkinsJobs/Builds/build.jenkinsfile @@ -344,7 +344,7 @@ spec: def readBuildProperties(String buildPropertiesFile){ return readProperties(file: buildPropertiesFile, charset: 'UTF-8').collectEntries{n, v -> - v = v.trim(); + v = v.strip(); return [n, (v.startsWith('"') && v.endsWith('"') ? v.substring(1, v.length() - 1) : v)] } } diff --git a/JenkinsJobs/Releng/publishToMaven.jenkinsfile b/JenkinsJobs/Releng/publishToMaven.jenkinsfile index 1e353e441b1..1336062757b 100644 --- a/JenkinsJobs/Releng/publishToMaven.jenkinsfile +++ b/JenkinsJobs/Releng/publishToMaven.jenkinsfile @@ -266,7 +266,7 @@ def installLatestEclipse(){ def props = null dir("${WORKSPACE}/git-repo") { props = readProperties(file: 'cje-production/buildproperties.txt').collectEntries{n, v -> - v = v.trim(); + v = v.strip(); return [n, (v.startsWith('"') && v.endsWith('"') ? v.substring(1, v.length() - 1) : v)] } } @@ -276,6 +276,6 @@ def installLatestEclipse(){ def install(String toolType, String url) { dir("${WORKSPACE}/tools/${toolType}") { sh "curl -L ${url} | tar -xzf -" - return "${pwd()}/" + sh(script: 'ls', returnStdout: true).trim() + return "${pwd()}/" + sh(script: 'ls', returnStdout: true).strip() } } diff --git a/JenkinsJobs/SmokeTests/StartSmokeTests.jenkinsfile b/JenkinsJobs/SmokeTests/StartSmokeTests.jenkinsfile index e080d3316b0..4926e03f7c7 100644 --- a/JenkinsJobs/SmokeTests/StartSmokeTests.jenkinsfile +++ b/JenkinsJobs/SmokeTests/StartSmokeTests.jenkinsfile @@ -158,6 +158,6 @@ def installJDK(String version, String os, String arch, String releaseType='ga') } dir ("${WORKSPACE}/java") { sh "curl -L https://api.adoptium.net/v3/binary/latest/${version}/${releaseType}/${os}/${arch}/jdk/hotspot/normal/eclipse | tar -xzf -" - return "${pwd()}/" + sh(script: 'ls', returnStdout: true).trim() + return "${pwd()}/" + sh(script: 'ls', returnStdout: true).strip() } } diff --git a/Jenkinsfile b/Jenkinsfile index c6f9b1f79eb..e26066ff6ea 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,7 +43,7 @@ pipeline { latestCommitID=$(curl https://download.eclipse.org/eclipse/relengScripts/state) git diff --name-only ${latestCommitID} HEAD \\ production/ scripts/ cje-production/ eclipse.platform.releng.tychoeclipsebuilder/ - ''', returnStdout: true).trim().isEmpty() + ''', returnStdout: true).strip().isEmpty() } } }