commit 7dce9551492d5510a596893ad2a89bd1130bd358
author Ed Merks <ed.merks@gmail.com> Sun Jun 07 12:09:53 2020 +0200
committer Ed Merks <ed.merks@gmail.com> Sun Jun 07 12:09:53 2020 +0200
tree 293fffeaafcc4c3151824fad3a28983e5489a7c9
parent a5c275cbc292cb3ebbf9bdd9b34dd407bd3dcc9f

Bug 562908 - Populate the JustJ Git clones with initial content

Somehow \r is ending up the URLs.

releng/org.eclipse.justj.releng/Jenkinsfile

diff --git a/releng/org.eclipse.justj.releng/Jenkinsfile b/releng/org.eclipse.justj.releng/Jenkinsfile
index 33ab78a..2730e9f 100644
--- a/releng/org.eclipse.justj.releng/Jenkinsfile
+++ b/releng/org.eclipse.justj.releng/Jenkinsfile
@@ -214,9 +214,9 @@
           env.PIPELINE_VERSION = params.PIPELINE_VERSION
           env.PUBLISH_LOCATION_PREFIX = params.PUBLISH_LOCATION_PREFIX
           env.JUSTJ_MANIFEST_URL = params.JUSTJ_MANIFEST_URL
-          env.JDK_URLS_WINDOWS = params.JDK_URLS_WINDOWS
-          env.JDK_URLS_MACOS = params.JDK_URLS_MACOS
-          env.JDK_URLS_LINUX = params.JDK_URLS_LINUX
+          env.JDK_URLS_WINDOWS = pretty(params.JDK_URLS_WINDOWS)
+          env.JDK_URLS_MACOS = pretty(params.JDK_URLS_MACOS)
+          env.JDK_URLS_LINUX = pretty(params.JDK_URLS_LINUX)
           env.BUILD_TYPE = params.BUILD_TYPE
           env.PROMOTE = params.PROMOTE
           if (params.JUSTJ_MANIFEST_URL != '') {
@@ -435,7 +435,7 @@
 }
 
 def pretty(string) {
-  return string.replaceAll("^\r?\n", "").replaceAll("\r?\n\$", "").stripIndent()
+  return string.replaceAll("^\r?\n", "").replaceAll("\r?\n\$", "").replace("\r", "").stripIndent()
 }
 
 def update(map1, map2) {