Merge "Migrate maven to freestyle for merge"

diff --combined jjb/releng-templates-java.yaml
index bea4575ae77c376161b80a669e32dfd8e9d2d092,ba326e0ac2bfc33d5f6444e7996b227a7bcbd491..ad8204cb166a465763b54ca852927b346ca03205
--- 1/jjb/releng-templates-java.yaml
--- 2/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@@ -66,7 -66,7 +66,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}'
  
@@@ -97,34 -97,28 +97,34 @@@
              jobs: '{project}-merge-{stream}'
              result: 'success'
  
 -    prebuilders:
 +    builders:
          - provide-maven-settings:
              global-settings-file: 'odl-global-settings'
              settings-file: '{mvn-settings}'
 -
 -    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
 +        - 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
  
      publishers:
          - email-notification:
              email-prefix: '[{project}]'
 -        - maven-deploy:
 -            id: ''
 -            unique-version: true
 -            deploy-unstable: false
          - opendaylight-infra-shiplogs:
              maven-version: '{mvn33}'
  
@@@ -314,7 -308,7 +314,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}'
  
@@@ -346,23 -340,29 +346,29 @@@
              name: '{project}'
              branch: '{branch}'
  
-     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 -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:
+         - 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
          - conditional-step:
              condition-kind: file-exists
              condition-filename: deploy-site.xml
@@@ -396,17 -396,11 +402,11 @@@
                  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}'
  
@@@ -475,7 -469,7 +475,7 @@@
      name: '{project-name}-sonar'
      disabled: false
  
 -    project-type: maven
 +    project-type: freestyle
      node: '{build-node}'
      jdk: 'openjdk8'
  
@@@ -506,38 -500,31 +506,38 @@@
          - gerrit-trigger-patch-sonar:
              name: '{project}'
  
 -    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 -Dsonar -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 -Dsonar -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
 +        - maven-target:
 +            maven-version: '{mvn33}'
 +            # We should switch to the recommended configuration of sonar once
 +            # JJB adds support for configurating the Sonar wrapper:
 +            #    http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner+for+Jenkins
 +            goals: 'sonar:sonar -V -B -Djenkins -Dsonar -Dsonar.host.url=https://sonar.opendaylight.org -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
  
      publishers:
 -        - sonar:
 -            language: 'java'
 -            maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m'
          - email-notification:
              email-prefix: '[{project-name}]'
          - jacoco-report
 +        - findbugs
          - opendaylight-infra-shiplogs:
              maven-version: '{mvn33}'