Revert "Migrate maven to freestyle for merge"

jar:jar actually causes <package>bundle</package> projects to not
produce the correct osgi jars ODL is expecting.

This reverts commit 9be0c3d09f2ae47bbb5e1eeb45482594d78a3e8f.

Change-Id: I3c839fe61988a8c1bd398d3805965d933dae0da3
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index ad8204cb166a465763b54ca852927b346ca03205..bea4575ae77c376161b80a669e32dfd8e9d2d092 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -314,7 +314,7 @@
     #     stream:    release stream (eg. stable-lithium or beryllium)
     #     branch:    git branch (eg. stable/lithium or master)
 
-    project-type: freestyle
+    project-type: maven
     node: '{build-node}'
     jdk: '{jdk}'
 
@@ -346,29 +346,23 @@
             name: '{project}'
             branch: '{branch}'
 
-    builders:
+    prebuilders:
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
             settings-file: '{mvn-settings}'
-        - maven-target:
-            maven-version: '{mvn33}'
-            goals: '{mvn-goals} -V -B -Djenkins -Dmerge -Dstream={stream} -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
-        - maven-target:
-            maven-version: '{mvn33}'
-            goals: 'validate jar:jar deploy:deploy -V -B -Djenkins -Dmerge -Dstream={stream} -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
+
+    maven:
+        maven-name: '{mvn33}'
+        goals: '{mvn-goals} -V -B -Djenkins -Dmerge -Dstream={stream} -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
+        post-step-run-condition: UNSTABLE
+
+    postbuilders:
         - conditional-step:
             condition-kind: file-exists
             condition-filename: deploy-site.xml
@@ -402,11 +396,17 @@
                 global-settings: 'odl-global-settings'
                 global-settings-type: cfp
 
+    reporters:
+        - findbugs
+
     publishers:
         - email-notification:
             email-prefix: '[{project-name}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
         - jacoco-report
-        - findbugs
         - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'