Bump default Maven version to 3.3.3

[releng/builder.git] / jjb-templates / verify.yaml

diff --git a/jjb-templates/verify.yaml b/jjb-templates/verify.yaml
index 99041ddd42736ec9d8394974e03a083b4705d50c..8ae7197186242100c9d0d693014c8cc9379ef932 100644 (file)
--- a/jjb-templates/verify.yaml
+++ b/jjb-templates/verify.yaml
@@ -9,10 +9,19 @@
     #     stream:    branch with - in place of / (eg. stable-helium)
     #     branch:    branch (eg. stable/helium)
 
-    project-type: maven
-    node: dynamic_verify
+    project-type: matrix
+    node: matrix_master
     concurrent: true
-    jdk: '{jdk}'
+
+    axes:
+        - axis:
+            type: slave
+            name: nodes
+            values:
+                - dynamic_verify
+        - axis:
+            type: jdk
+            values: '{obj:jdks}'
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -35,29 +44,28 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-submitted:
             name: 'PROJECT'
             branch: '{branch}'
 
-    prebuilders:
+    builders:
         - wipe-org-opendaylight-repo
-
-    maven:
-        maven-name: '{mvn32}'
-        root-pom: 'pom.xml'
-        goals: 'MAVEN_GOALS'
-        maven-opts: 'MAVEN_OPTS'
-        settings: '{PROJECT-settings}'
-        global-settings: '{odl-global-settings}'
-        ignore-upstream-changes: true
-
-    postbuilders:
+        - maven-target:
+            maven-version: '{mvn33}'
+            pom: 'POM'
+            goals: 'MAVEN_GOALS'
+            java-opts:
+                - 'MAVEN_OPTS'
+            settings: '{PROJECT-settings}'
+            global-settings: '{odl-global-settings}'
         - jacoco-nojava-workaround
 
     publishers:
+        - findbugs
         - email-notification:
             email-prefix: '[PROJECT]'
         - jacoco-report