Merge "Install mvn via lf-maven-install macro"

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 7df283921530c858d57305ea49e131fd68e0c948..a34dbc9676c5c4af380f94f5086a0cc8a5bebd76 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -96,6 +96,7 @@
     # Default parameters #
     ######################
 
+    mvn-version: mvn33
     java-version: openjdk8
 
     #####################
@@ -147,10 +148,12 @@
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
+      - lf-maven-install:
+          mvn-version: '{mvn-version}'
 
     # TODO: Do we want to apply sophisticated checks as in *-distribution-check-*?
     maven:
-      maven-name: 'mvn33'
+      maven-name: '{mvn-version}'
       goals: >
           {mvn-goals}
           -Dmerge