Merge "Migrate maven to freestyle for integration"

diff --combined jjb/releng-templates-java.yaml
index 038b90ab574bd6fb0d42668f36f074a5f0338762,d5cd6d13a760f3a7e26ca0bf4282f9330ef87a0c..7b5e162f2e439d83cb7b325f924cd0b5e804b8b8
--- 1/jjb/releng-templates-java.yaml
--- 2/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@@ -8,7 -8,7 +8,7 @@@
      #   {jdk}
      name: '{project-name}-clm-{stream}'
  
 -    project-type: maven
 +    project-type: freestyle
      node: '{build-node}'
      jdk: '{jdk}'
  
@@@ -35,20 -35,22 +35,20 @@@
      triggers:
          - timed: 'H H * * 6'
  
 -    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 com.sonatype.clm:clm-maven-plugin:index -V -B -Djenkins -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
 -        maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
 -        settings: '{mvn-settings}'
 -        settings-type: cfp
 -        global-settings: 'odl-global-settings'
 -        global-settings-type: cfp
 -
 -    postbuilders:
 +        - maven-target:
 +            maven-version: '{mvn33}'
 +            pom: 'pom.xml'
 +            goals: 'clean install dependency:tree com.sonatype.clm:clm-maven-plugin:index -V -B -Djenkins -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
 +            java-opts:
 +              - '-Xmx4096m -XX:MaxPermSize=512m'
 +            settings: '{mvn-settings}'
 +            settings-type: cfp
 +            global-settings: 'odl-global-settings'
 +            global-settings-type: cfp
          - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
          - check-clm:
              application-name: '{project-name}'
@@@ -131,7 -133,7 +131,7 @@@
      name: '{project-name}-distribution-check-{stream}'
      disabled: '{obj:disable_distribution_check}'
  
 -    project-type: maven
 +    project-type: freestyle
      node: '{build-node}'
      concurrent: true
      jdk: '{jdk}'
@@@ -189,7 -191,7 +189,7 @@@
                  unstable: false
                  notbuilt: false
  
 -    prebuilders:
 +    builders:
          - maven-target:
              maven-version: '{mvn33}'
              pom: '$GERRIT_PROJECT/pom.xml'
@@@ -200,16 -202,20 +200,16 @@@
              settings-type: cfp
              global-settings: 'odl-global-settings'
              global-settings-type: cfp
 -
 -    maven:
 -        maven-name: '{mvn33}'
 -        root-pom: 'distribution/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: '{mvn-settings}'
 -        settings-type: cfp
 -        global-settings: 'odl-global-settings'
 -        global-settings-type: cfp
 -        ignore-upstream-changes: true
 -        post-step-run-condition: 'SUCCESS'
 -
 -    postbuilders:
 +        - maven-target:
 +            maven-version: '{mvn33}'
 +            pom: 'distribution/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: '{mvn-settings}'
 +            settings-type: cfp
 +            global-settings: 'odl-global-settings'
 +            global-settings-type: cfp
          - integration-distribution-check
  
      publishers:
@@@ -240,7 -246,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 -277,25 +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}'
@@@ -534,13 -538,16 +532,13 @@@
      name: '{project-name}-validate-autorelease-{stream}'
      disabled: '{obj:disable_autorelease}'
  
 -    project-type: maven
 +    project-type: freestyle
      node: '{build-node}'
      concurrent: true
      jdk: '{jdk}'
  
      logrotate:
 -        daysToKeep: '{build-days-to-keep}'
 -        numToKeep: '{build-num-to-keep}'
 -        artifactDaysToKeep: '{build-artifact-days-to-keep}'
 -        artifactNumToKeep: '{build-artifact-num-to-keep}'
 +        daysToKeep: '7'
  
      parameters:
          - opendaylight-infra-parameters:
@@@ -598,7 -605,7 +596,7 @@@
                      - compare-type: ANT
                        pattern: '**/*.xml'
  
 -    prebuilders:
 +    builders:
          - jacoco-nojava-workaround
          - autorelease-checkout-gerrit-patch
          - autorelease-generate-release-patches
@@@ -607,21 -614,25 +605,21 @@@
              pom: validate-pom.xml
              goals: 'clean install dependency:tree -V -B -T1.5C -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
              java-opts:
 -            - '-Xmx8g'
 +              - '-Xmx8g'
 +            settings: 'autorelease-settings'
 +            settings-type: cfp
 +            global-settings: 'odl-global-settings'
 +            global-settings-type: cfp
 +        - maven-target:
 +            maven-version: '{mvn33}'
 +            pom: 'pom.xml'
 +            goals: 'clean validate -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
 +            java-opts:
 +              - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
              settings: 'autorelease-settings'
              settings-type: cfp
              global-settings: 'odl-global-settings'
              global-settings-type: cfp
 -
 -    maven:
 -        maven-name: '{mvn33}'
 -        root-pom: 'pom.xml'
 -        goals: 'clean validate -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
 -        maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
 -        settings: 'autorelease-settings'
 -        settings-type: cfp
 -        global-settings: 'odl-global-settings'
 -        global-settings-type: cfp
 -        automatic-archiving: false
 -        post-step-run-condition: UNSTABLE
 -
 -    postbuilders:
          - autorelease-sys-stats
  
      publishers: