Switch distribution jobs to use mvn35

Issue: RELENG-97
Change-Id: I3a2dbb37746d1952016a273da721c91fa70651d4
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 5cfd5a6bf73d3bc2931f9c79aa522459cc0fe9f0..78ba3a4b6d012c4f2dc123b42f0c296fa934b8db 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -41,7 +41,7 @@
           global-settings-file: 'global-settings'
           settings-file: 'integration-settings'
       - maven-target:
-          maven-version: mvn33
+          maven-version: mvn35
           pom: pom.xml
           goals: |
               clean install dependency:tree -DoutputFile=dependency_tree.txt
@@ -117,7 +117,7 @@
           path: '$KARAF_ARTIFACT/src/main/assembly'
 
     maven:
-      maven-name: 'mvn33'
+      maven-name: 'mvn35'
       root-pom: 'pom.xml'
       goals: >
           clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B
@@ -158,7 +158,7 @@
     # Default parameters #
     ######################
 
-    mvn-version: mvn33
+    mvn-version: mvn35
 
     #####################
     # Job Configuration #
@@ -188,7 +188,7 @@
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - maven-exec:
-          maven-version: mvn33
+          maven-version: mvn35
 
     scm:
       - integration-gerrit-scm:

diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index 4453612348a80996a87379cb8d6abfa2e8d92443..dc2f73aa66006f495b762a99c7ebd89488f677f3 100644 (file)
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -10,7 +10,7 @@
     ######################
 
     java-version: openjdk8
-    mvn-version: mvn33
+    mvn-version: mvn35
 
     #####################
     # Job Configuration #