Revert "Migrate maven to freestyle for distribution"

jar:jar causes issues with <package>bundle</bundle> projects and does
not produce the correct OSGI jar files.

This reverts commit ed8c6237eb2a2a7c6e2a245d2250230ebcfa2b71.

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

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index bea4575ae77c376161b80a669e32dfd8e9d2d092..9caa5f984e93ffa5fe38c907b96c05972d2b8aee 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -66,7 +66,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}'
 
@@ -97,34 +97,28 @@
             jobs: '{project}-merge-{stream}'
             result: 'success'
 
-    builders:
+    prebuilders:
         - provide-maven-settings:
             global-settings-file: 'odl-global-settings'
             settings-file: '{mvn-settings}'
-        - maven-target:
-            maven-version: '{mvn33}'
-            pom: 'pom.xml'
-            goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-            java-opts:
-              - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-            settings: 'integration-distribution-settings'
-            settings-type: cfp
-            global-settings: 'odl-global-settings'
-            global-settings-type: cfp
-        - maven-target:
-            maven-version: '{mvn33}'
-            pom: 'pom.xml'
-            goals: 'validate jar:jar deploy:deploy -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-            java-opts:
-              - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-            settings: 'integration-distribution-settings'
-            settings-type: cfp
-            global-settings: 'odl-global-settings'
-            global-settings-type: cfp
+
+    maven:
+        maven-name: '{mvn33}'
+        root-pom: 'pom.xml'
+        goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+        settings: 'integration-distribution-settings'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
 
     publishers:
         - email-notification:
             email-prefix: '[{project}]'
+        - maven-deploy:
+            id: ''
+            unique-version: true
+            deploy-unstable: false
         - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'