summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/global-macros.yaml9
-rw-r--r--jjb/global-templates-java.yaml2
2 files changed, 11 insertions, 0 deletions
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 2d2d6c3e6..46c4d827f 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -20,6 +20,15 @@
- file-id: '{settings-file}'
variable: 'SETTINGS_FILE'
+# call maven-target builder with a goal of --version to force Jenkins to
+# install the needed maven version
+- builder:
+ name: maven-install
+ builders:
+ - maven-target:
+ maven-version: '{maven-version}'
+ goals: '--version'
+
- builder:
name: maven-docker-push-release
builders:
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 4423d2072..7147a2081 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -788,6 +788,7 @@
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
+ - maven-install
- inject:
properties-file: version.properties
@@ -862,6 +863,7 @@
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
+ - maven-install
- inject:
properties-file: version.properties