X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-templates-java.yaml;h=c6af80ec2fde9d7385bfcf1002e1a2360ea4a4c2;hb=8ea99dd210066427b9d1faa55cac7378aaeb3051;hp=8356b41d4b6c4ea988b84bc259153444373f1561;hpb=5043edcf621ddc51a2c134d2a8c880a1e2dfe677;p=releng%2Fbuilder.git

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 8356b41d4..c6af80ec2 100644
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -44,12 +44,10 @@
       - maven-target:
           maven-version: 'mvn33'
           pom: 'pom.xml'
-          goals: >
+          goals: |
               clean install dependency:tree com.sonatype.clm:clm-maven-plugin:index
-              -V -B -Pq
-              -Djenkins
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              -Pq
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx4096m -XX:MaxPermSize=512m'
           settings: '{mvn-settings}'
@@ -201,7 +199,9 @@
           settings-file: '{mvn-settings}'
       - maven-target:
           maven-version: 'mvn33'
-          goals: '{mvn-goals} -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+          goals: |
+              {mvn-goals}
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '{mvn-opts}'
           settings: '{mvn-settings}'
@@ -277,12 +277,9 @@
       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
+          {opendaylight-infra-mvn-opts}
       maven-opts: '{mvn-opts}'
       settings: '{mvn-settings}'
       settings-type: cfp
@@ -385,13 +382,10 @@
           settings-file: '{mvn-settings}'
       - maven-target:
           maven-version: 'mvn33'
-          goals: >
+          goals: |
               {mvn-goals}
-              -V -B
-              -Djenkins
               -Dsonar
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              {opendaylight-infra-mvn-opts}
           maven-opts:
             - '{mvn-opts}'
           settings: '{mvn-settings}'
@@ -403,13 +397,11 @@
           # 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: >
+          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
+              {opendaylight-infra-mvn-opts}
           maven-opts:
             - '{mvn-opts}'
           settings: '{mvn-settings}'
@@ -490,12 +482,11 @@
       - maven-target:
           maven-version: 'mvn33'
           pom: validate-pom.xml
-          goals: >
+          goals: |
               clean install dependency:tree
-              -V -B -T1.5C -Pq
-              -Djenkins
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              -T1.5C
+              -Pq
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx8g'
           settings: 'autorelease-settings'
@@ -505,12 +496,10 @@
       - maven-target:
           maven-version: 'mvn33'
           pom: 'pom.xml'
-          goals: >
+          goals: |
               clean validate
-              -V -B -Pq
-              -Djenkins
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              -Pq
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: 'autorelease-settings'
@@ -577,12 +566,10 @@
           settings-file: '{mvn-settings}'
       - maven-target:
           maven-version: '{mvn-version}'
-          goals: >
-              {mvn-goals} -V -B
-              -Djenkins
+          goals: |
+              {mvn-goals}
               -Dstream={stream}
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              {opendaylight-infra-mvn-opts}
           java-opts:
             - '{mvn-opts}'
           settings: '{mvn-settings}'