Release global-jjb v0.19.0

[releng/global-jjb.git] / jjb / lf-maven-jobs.yaml

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index f127e91..b2482c1 100644 (file)
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -71,7 +71,8 @@
 - builder:
     name: lf-maven-stage
     builders:
-      - shell: !include-raw-escape:
+      # include-raw-escape fails due to JJB bug
+      - shell: !include-raw:
           - ../shell/common-variables.sh
           - ../shell/maven-stage.sh
 
@@ -79,7 +80,11 @@
     name: lf-update-java-alternatives
     builders:
       - inject:
-          properties-content: 'SET_JDK_VERSION={java-version}'
+          # Work around inject plugin overriding our GIT_URL variable incorrectly
+          # https://issues.jenkins-ci.org/browse/JENKINS-49775
+          properties-content: |
+            SET_JDK_VERSION={java-version}
+            GIT_URL="$GIT_URL"
       - shell: !include-raw-escape: ../shell/update-java-alternatives.sh
       - inject:
           properties-file: '/tmp/java.env'