From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Sat, 13 Aug 2016 19:33:36 +0000 (+0000)
Subject: Merge "Migrate maven to freestyle for integration"
X-Git-Tag: release/boron~82
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=c5e04f9e6d91ae8fa9d2d73dd34d4b8f7224d0fb;hp=2a8744f668e76ecda6b4f579fa9cc01da649963b;p=releng%2Fbuilder.git

Merge "Migrate maven to freestyle for integration"
---

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 038b90ab5..7b5e162f2 100644
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -240,7 +240,7 @@
     #     stream:    release stream (eg. stable-lithium or beryllium)
     #     branch:    git branch (eg. stable/lithium or master)
 
-    project-type: maven
+    project-type: freestyle
     node: '{build-node}'
     jdk: '{jdk}'
 
@@ -271,27 +271,25 @@
             jobs: '{dependencies}'
             result: 'success'
 
-    prebuilders:
+    builders:
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
             settings-file: '{mvn-settings}'
-
-    maven:
-        maven-name: '{mvn33}'
-        goals: '{mvn-goals} -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '{mvn-opts}'
-        settings: '{mvn-settings}'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-
-    reporters:
-        - findbugs
+        - maven-target:
+            maven-version: '{mvn33}'
+            goals: '{mvn-goals} -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            java-opts:
+              - '{mvn-opts}'
+            settings: '{mvn-settings}'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
 
     publishers:
         - email-notification:
             email-prefix: '{email-upstream}'
+        - findbugs
         - jacoco-report
         - archive-build:
             maven-version: '{mvn33}'