From: Thanh Ha Date: Fri, 2 Feb 2018 01:22:38 +0000 (-0500) Subject: Remove mvn-goals for projects that use default X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F44%2F67844%2F1;hp=8800579f6983befff06350107dcf30569fc3b003;p=releng%2Fbuilder.git Remove mvn-goals for projects that use default Cleanup projects that are not modifying mvn-goals in anyway. This is preparation for https://gerrit.linuxfoundation.org/infra/8438 Change-Id: I646743747b908c33bfac5753c30ec8830a3f908d Signed-off-by: Thanh Ha --- diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index e6816390e..cfe54db39 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'aaa-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[aaa] [odlparent] [yangtools] [controller]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'aaa-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[aaa] [odlparent] [yangtools] [controller]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'aaa-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[aaa] [odlparent] [yangtools] [controller]' @@ -87,5 +84,4 @@ project-name: 'aaa' branch: 'master' mvn-settings: 'aaa-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index 4527fd8e8..3a4d7daf0 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'alto-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'l2switch-merge-{stream}' email-upstream: '[alto] [l2switch]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'alto-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'l2switch-merge-{stream}' email-upstream: '[alto] [l2switch]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'alto-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'l2switch-merge-{stream}' email-upstream: '[alto] [l2switch]' @@ -87,5 +84,4 @@ project-name: 'alto' branch: 'master' mvn-settings: 'alto-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml index 7a9dad82b..57d5235d0 100644 --- a/jjb/atrium/atrium.yaml +++ b/jjb/atrium/atrium.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'atrium-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[atrium]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'atrium-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[atrium]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'atrium-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[atrium]' @@ -86,5 +83,4 @@ project-name: 'atrium' branch: 'master' mvn-settings: 'atrium-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index da8da068b..bde19d53e 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -19,7 +19,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'bgpcep-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m' dependencies: > odlparent-merge-{stream}, @@ -53,7 +52,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'bgpcep-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m' dependencies: > odlparent-merge-{stream}, @@ -88,7 +86,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'bgpcep-settings' - mvn-goals: 'clean -DrepoBuild install javadoc:aggregate' mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m' dependencies: > odlparent-merge-{stream}, @@ -112,5 +109,4 @@ build-node: centos7-builder-2c-8g branch: 'master' mvn-settings: 'bgpcep-settings' - mvn-goals: 'clean -DrepoBuild install javadoc:aggregate' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index 98796735d..3d7866013 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -17,7 +17,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'bier-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[bier]' @@ -43,7 +42,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'bier-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[bier]' @@ -70,7 +68,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'bier-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[bier]' @@ -88,5 +85,4 @@ project-name: 'bier' branch: 'master' mvn-settings: 'bier-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index eb31447c6..1c88daa79 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'capwap-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[capwap]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'capwap-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[capwap]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'capwap-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[capwap]' @@ -87,5 +84,4 @@ project-name: 'capwap' branch: master mvn-settings: 'capwap-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml index ffc3baa5c..ab5950738 100644 --- a/jjb/cardinal/cardinal.yaml +++ b/jjb/cardinal/cardinal.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'cardinal-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}' email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'cardinal-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}' email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'cardinal-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}' email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]' @@ -87,5 +84,4 @@ project-name: 'cardinal' branch: 'master' mvn-settings: 'cardinal-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml index bd045cbf8..0dfe2a5a7 100644 --- a/jjb/centinel/centinel.yaml +++ b/jjb/centinel/centinel.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'centinel-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[centinel]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'centinel-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[centinel]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'centinel-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[centinel]' @@ -87,5 +84,4 @@ project-name: 'centinel' branch: master mvn-settings: 'centinel-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index bda82a856..6341c8a1a 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'coe-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[coe] [odlparent] [yangtools] [controller]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'coe-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[coe] [odlparent] [yangtools] [controller]' @@ -68,7 +66,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'coe-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[coe] [odlparent] [yangtools] [controller]' @@ -86,5 +83,4 @@ project-name: 'coe' branch: 'master' mvn-settings: 'coe-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml index ae09f245f..3a9f3906c 100644 --- a/jjb/coretutorials/coretutorials.yaml +++ b/jjb/coretutorials/coretutorials.yaml @@ -15,7 +15,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'coretutorials-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[coretutorials]' @@ -41,7 +40,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'coretutorials-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[coretutorials]' @@ -68,7 +66,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'coretutorials-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[coretutorials]' @@ -87,6 +84,5 @@ project-name: 'coretutorials' branch: master mvn-settings: 'coretutorials-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' build-timeout: 120 diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 96ad52781..db876be84 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'daexim-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[daexim] [odlparent] [yangtools] [controller]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'daexim-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[daexim] [odlparent] [yangtools] [controller]' @@ -60,5 +58,4 @@ project-name: 'daexim' branch: 'master' mvn-settings: 'daexim-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml index de560eea3..5a0454e35 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'didm-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[didm]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'didm-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[didm]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'didm-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[didm]' @@ -86,5 +83,4 @@ project-name: 'didm' branch: 'master' mvn-settings: 'didm-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index e6ab39ea9..2072066aa 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'dlux-settings' - mvn-goals: 'clean install -e' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[dlux] [odlparent]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'dlux-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[dlux] [odlparent]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'dlux-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[dlux] [odlparent]' @@ -86,5 +83,4 @@ project-name: 'dlux' branch: 'master' mvn-settings: 'dlux-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index 0b479d155..6d2bc4505 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'dluxapps-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'dluxapps-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'dluxapps-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]' @@ -87,5 +84,4 @@ project-name: 'dluxapps' branch: 'master' mvn-settings: 'dluxapps-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml index df4f24a34..13eda9e1f 100644 --- a/jjb/eman/eman.yaml +++ b/jjb/eman/eman.yaml @@ -17,7 +17,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'eman-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[eman]' @@ -45,7 +44,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'eman-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[eman]' @@ -74,7 +72,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'eman-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[eman]' @@ -92,5 +89,4 @@ project-name: 'eman' branch: 'master' mvn-settings: 'eman-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml index af7804f42..426b8736d 100644 --- a/jjb/faas/faas.yaml +++ b/jjb/faas/faas.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'faas-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[faas]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'faas-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[faas]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'faas-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[faas]' @@ -86,5 +83,4 @@ project-name: 'faas' branch: 'master' mvn-settings: 'faas-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml index b4180e1b3..983b002fd 100644 --- a/jjb/federation/federation.yaml +++ b/jjb/federation/federation.yaml @@ -17,7 +17,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'federation-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[federation] [odlparent] [yangtools] [controller]' @@ -44,7 +43,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'federation-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[federation] [odlparent] [yangtools] [controller]' @@ -72,7 +70,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'federation-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[federation] [odlparent] [yangtools] [controller]' @@ -90,5 +87,4 @@ project-name: 'federation' branch: 'master' mvn-settings: 'federation-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index a11bd16a7..0e3f9bbd1 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -17,7 +17,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'genius-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' build-timeout: 90 dependencies: > @@ -49,7 +48,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'genius-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: > controller-merge-{stream}, @@ -81,7 +79,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'genius-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: > controller-merge-{stream}, @@ -103,5 +100,4 @@ project-name: 'genius' branch: 'master' mvn-settings: 'genius-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/global-jjb b/jjb/global-jjb index d38f363f0..d22c3fe8f 160000 --- a/jjb/global-jjb +++ b/jjb/global-jjb @@ -1 +1 @@ -Subproject commit d38f363f0ebb7246b9481900a5f1fa2ef0bab3e8 +Subproject commit d22c3fe8f7bc3f3276dedd7448c4f82f50fe7584 diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index 157660f36..3c93910c8 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'honeycomb-vbd-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[vbd]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'honeycomb-vbd-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[vbd]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'honeycomb-vbd-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[vbd]' @@ -86,5 +83,4 @@ project-name: 'vbd' branch: 'master' mvn-settings: 'honeycomb-vbd-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 77fe7e4b3..a1f8931d0 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -17,7 +17,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'infrautils-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[infrautils] [odlparent]' @@ -43,7 +42,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'infrautils-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[infrautils] [odlparent]' @@ -70,7 +68,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'infrautils-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[infrautils] [odlparent]' @@ -87,5 +84,4 @@ project-name: 'infrautils' branch: 'master' mvn-settings: 'infrautils-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml index c2c135ab6..e1c4205f5 100644 --- a/jjb/iotdm/iotdm.yaml +++ b/jjb/iotdm/iotdm.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'iotdm-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'aaa-merge-{stream}' email-upstream: '[iotdm] [aaa]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'iotdm-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'aaa-merge-{stream}' email-upstream: '[iotdm] [aaa]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'iotdm-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'aaa-merge-{stream}' email-upstream: '[iotdm] [aaa]' @@ -86,5 +83,4 @@ project-name: 'iotdm' branch: 'master' mvn-settings: 'iotdm-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 48cb51f35..a8d7695de 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -15,7 +15,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'jsonrpc-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' @@ -40,7 +39,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'jsonrpc-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' @@ -65,7 +63,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'jsonrpc-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' @@ -91,7 +88,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'jsonrpc-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' @@ -109,5 +105,4 @@ project-name: 'jsonrpc' branch: 'master' mvn-settings: 'jsonrpc-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index f203d8959..36eb6bc77 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'l2switch-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' dependencies: > odlparent-merge-{stream}, @@ -47,7 +46,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'l2switch-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' dependencies: > odlparent-merge-{stream}, @@ -79,7 +77,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'l2switch-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' dependencies: > odlparent-merge-{stream}, @@ -101,5 +98,4 @@ project-name: 'l2switch' branch: 'master' mvn-settings: 'l2switch-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml index 72c8ca70b..8165b64ba 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -16,7 +16,6 @@ maven: - mvn33: mvn-version: 'mvn33' - mvn-goals: 'clean install javadoc:aggregate -DrepoBuild' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}' email-upstream: '[lacp] [openflowjava] [openflowplugin]' @@ -42,7 +41,6 @@ maven: - mvn33: mvn-version: 'mvn33' - mvn-goals: 'clean install javadoc:aggregate -DrepoBuild' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}' email-upstream: '[lacp] [openflowjava] [openflowplugin]' @@ -69,7 +67,6 @@ maven: - mvn33: mvn-version: 'mvn33' - mvn-goals: 'clean install javadoc:aggregate -DrepoBuild' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}' email-upstream: '[lacp] [openflowjava] [openflowplugin]' @@ -86,5 +83,4 @@ project-name: 'lacp' branch: 'master' mvn-settings: 'lacp-settings' - mvn-goals: 'clean install javadoc:aggregate -DrepoBuild' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml index 5c6f81e30..7c5b70938 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -17,7 +17,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'messaging4transport-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[messaging4transport]' @@ -44,7 +43,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'messaging4transport-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[messaging4transport]' @@ -72,7 +70,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'messaging4transport-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[messaging4transport]' @@ -89,5 +86,4 @@ project-name: 'messaging4transport' branch: 'master' mvn-settings: 'messaging4transport-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml index 023296967..a43775c65 100644 --- a/jjb/natapp/natapp.yaml +++ b/jjb/natapp/natapp.yaml @@ -17,7 +17,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'natapp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' email-upstream: '[natapp] [openflowplugin]' @@ -44,7 +43,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'natapp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' email-upstream: '[natapp] [openflowplugin]' @@ -72,7 +70,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'natapp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' email-upstream: '[natapp] [openflowplugin]' @@ -89,5 +86,4 @@ project-name: 'natapp' branch: 'master' mvn-settings: 'natapp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 0b37f358e..87b339e40 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'nemo-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[nemo]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'nemo-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[nemo]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'nemo-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[nemo]' @@ -86,5 +83,4 @@ project-name: 'nemo' branch: 'master' mvn-settings: 'nemo-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml index 318b15c50..0fed6ebf8 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'netide-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream}' email-upstream: '[netide] [openflowjava]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'netide-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream}' email-upstream: '[netide] [openflowjava]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'netide-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowjava-merge-{stream}' email-upstream: '[netide] [openflowjava]' @@ -86,5 +83,4 @@ project-name: 'netide' branch: 'master' mvn-settings: 'netide-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 846501688..9d96885ac 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -24,7 +24,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'netvirt-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m' build-timeout: 90 build-node: centos7-builder-4c-16g @@ -58,7 +57,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'netvirt-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m' dependencies: email-upstream: '[netvirt]' @@ -72,5 +70,4 @@ project-name: 'netvirt' branch: 'master' mvn-settings: 'netvirt-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 3f3de316a..25b5a8abb 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -18,7 +18,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'neutron-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' email-upstream: '[neutron] [odlparent] [aaa]' @@ -46,7 +45,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'neutron-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' email-upstream: '[neutron] [odlparent] [aaa]' @@ -75,7 +73,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'neutron-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' email-upstream: '[neutron] [odlparent] [aaa]' @@ -92,5 +89,4 @@ project-name: 'neutron' branch: 'master' mvn-settings: 'neutron-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml index 36c1d21e9..e8411141b 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'next-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[next]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'next-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[next]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'next-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[next]' @@ -85,6 +82,5 @@ project: 'next' project-name: 'next' branch: 'master' - mvn-settings: 'tsdr-settings' - mvn-goals: 'clean install javadoc:aggregate -DrepoBuild' + mvn-settings: 'next-settings' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index 0af5510cd..c172fc09b 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'nic-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}' email-upstream: '[nic] [vtn] [groupbasedpolicy]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'nic-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}' email-upstream: '[nic] [vtn] [groupbasedpolicy]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'nic-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}' email-upstream: '[nic] [vtn] [groupbasedpolicy]' @@ -86,5 +83,4 @@ project-name: 'nic' branch: 'master' mvn-settings: 'nic-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml index 9865f61af..c7169ae3f 100644 --- a/jjb/ocpplugin/ocpplugin.yaml +++ b/jjb/ocpplugin/ocpplugin.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'ocpplugin-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'ocpplugin-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'ocpplugin-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]' @@ -86,5 +83,4 @@ project-name: 'ocpplugin' branch: 'master' mvn-settings: 'ocpplugin-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index 3a13df042..02a958c50 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -18,7 +18,6 @@ - mvn35: mvn-version: mvn35 mvn-settings: odlparent-settings - mvn-goals: clean install mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' mvn-version: mvn35 @@ -54,7 +53,6 @@ - mvn33: mvn-version: mvn33 mvn-settings: odlparent-settings - mvn-goals: clean install mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' mvn-version: mvn33 @@ -91,7 +89,6 @@ - mvn33: mvn-version: mvn33 mvn-settings: odlparent-settings - mvn-goals: clean install mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' mvn-version: mvn33 @@ -128,7 +125,6 @@ - mvn33: mvn-version: mvn33 mvn-settings: odlparent-settings - mvn-goals: clean install mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' mvn-version: mvn33 @@ -166,7 +162,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'odlparent-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[odlparent]' @@ -191,5 +186,4 @@ project-name: 'odlparent' branch: 'master' mvn-settings: 'odlparent-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index 7677ec676..4c8c8c2b4 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'of-config-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: netconf-merge-{stream}' email-upstream: '[of-config] [netconf]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'of-config-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: netconf-merge-{stream}' email-upstream: '[of-config] [netconf]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'of-config-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: netconf-merge-{stream}' email-upstream: '[of-config] [netconf]' @@ -86,5 +83,4 @@ project-name: 'of-config' branch: 'master' mvn-settings: 'of-config-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml index 66bfcae95..4ec44a814 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.yaml +++ b/jjb/ofextensions/circuitsw/circuitsw.yaml @@ -15,7 +15,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'ofextensions-circuitsw-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[circuitsw]' @@ -40,7 +39,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'ofextensions-circuitsw-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[circuitsw]' @@ -65,7 +63,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'ofextensions-circuitsw-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[circuitsw]' @@ -82,5 +79,4 @@ project-name: 'circuitsw' branch: 'master' mvn-settings: 'ofextensions-circuitsw-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml index c2a080e1d..ea75fe234 100644 --- a/jjb/openflowjava/openflowjava.yaml +++ b/jjb/openflowjava/openflowjava.yaml @@ -17,7 +17,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'openflowjava-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]' @@ -45,7 +44,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'openflowjava-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]' @@ -62,5 +60,4 @@ project-name: 'openflowjava' branch: 'master' mvn-settings: 'openflowjava-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ovil/ovil.yaml b/jjb/ovil/ovil.yaml index 2e5d81414..c9e2ca8f1 100644 --- a/jjb/ovil/ovil.yaml +++ b/jjb/ovil/ovil.yaml @@ -11,7 +11,6 @@ - oxygen: branch: master mvn-settings: ovil-settings - mvn-goals: clean install mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' mvn-version: mvn33 @@ -30,5 +29,4 @@ project-name: 'ovil' branch: 'master' mvn-settings: 'ovil-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index a87a43b98..e3b4144ba 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -17,7 +17,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'ovsdb-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' @@ -44,7 +43,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'ovsdb-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' @@ -72,7 +70,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'ovsdb-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml index 985d6b25e..2cb8cb5f6 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -17,7 +17,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'p4plugin-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[p4plugin]' @@ -35,5 +34,4 @@ project-name: 'p4plugin' branch: 'master' mvn-settings: 'p4plugin-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index afdf9373d..79471ef20 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'packetcable-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[packetcable]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'packetcable-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[packetcable]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'packetcable-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[packetcable]' @@ -86,5 +83,4 @@ project-name: 'packetcable' branch: 'master' mvn-settings: 'packetcable-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml index d89c48f5b..69874c7bc 100644 --- a/jjb/persistence/persistence.yaml +++ b/jjb/persistence/persistence.yaml @@ -17,7 +17,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'persistence-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[persistence]' @@ -44,7 +43,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'persistence-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[persistence]' @@ -72,7 +70,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'persistence-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[persistence]' @@ -89,5 +86,4 @@ project-name: 'persistence' branch: 'master' mvn-settings: 'persistence-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml index 1e32c5d21..e54d68836 100644 --- a/jjb/reservation/reservation.yaml +++ b/jjb/reservation/reservation.yaml @@ -15,7 +15,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'reservation-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[reservation]' @@ -40,7 +39,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'reservation-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[reservation]' @@ -66,7 +64,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'reservation-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[reservation]' @@ -83,5 +80,4 @@ project-name: 'reservation' branch: 'master' mvn-settings: 'reservation-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml index 90d2d5aa5..fb69bca62 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'sdninterfaceapp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'bgpcep-merge-{stream}' email-upstream: '[sdninterfaceapp] [bgpcep]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'sdninterfaceapp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'bgpcep-merge-{stream}' email-upstream: '[sdninterfaceapp] [bgpcep]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'sdninterfaceapp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'bgpcep-merge-{stream}' email-upstream: '[sdninterfaceapp] [bgpcep]' @@ -86,5 +83,4 @@ project-name: 'sdninterfaceapp' branch: 'master' mvn-settings: 'sdninterfaceapp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index 972f346a2..b9beeb3b0 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'sfc-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' build-timeout: 120 dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' @@ -44,7 +43,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'sfc-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' @@ -72,7 +70,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'sfc-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' @@ -90,5 +87,4 @@ project-name: 'sfc' branch: 'master' mvn-settings: 'sfc-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml index 6958d317b..c46022405 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'snbi-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[snbi]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'snbi-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[snbi]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'snbi-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[snbi]' @@ -86,5 +83,4 @@ project-name: 'snbi' branch: 'master' mvn-settings: 'snbi-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index c73acb1be..5d9f96469 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'snmp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[snmp] [odlparent]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'snmp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[snmp] [odlparent]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'snmp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[snmp] [odlparent]' @@ -86,5 +83,4 @@ project-name: 'snmp' branch: 'master' mvn-settings: 'snmp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index b29129035..f1dcb72df 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'snmp4sdn-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'snmp4sdn-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'snmp4sdn-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' @@ -86,5 +83,4 @@ project-name: 'snmp4sdn' branch: 'master' mvn-settings: 'snmp4sdn-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index a74ba2d59..f9676c828 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'sxp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[sxp] [odlparent] [controller] [yangtools]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'sxp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[sxp] [odlparent] [controller] [yangtools]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'sxp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[sxp] [odlparent] [controller] [yangtools]' @@ -86,5 +83,4 @@ project-name: 'sxp' branch: 'master' mvn-settings: 'sxp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml index 88514e606..095a71bb0 100644 --- a/jjb/systemmetrics/systemmetrics.yaml +++ b/jjb/systemmetrics/systemmetrics.yaml @@ -15,7 +15,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'systemmetrics-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]' @@ -40,7 +39,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'systemmetrics-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]' @@ -66,7 +64,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'systemmetrics-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]' @@ -84,5 +81,4 @@ project-name: 'systemmetrics' branch: 'master' mvn-settings: 'systemmetrics-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml index 6c78c55e2..3580e8260 100644 --- a/jjb/topoprocessing/topoprocessing.yaml +++ b/jjb/topoprocessing/topoprocessing.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'topoprocessing-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'topoprocessing-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'topoprocessing-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]' @@ -89,5 +86,4 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'topoprocessing-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index a905cf964..c33d29f32 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -15,7 +15,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'transportpce-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[transportpce] [odlparent] [yangtools] [controller]' @@ -40,7 +39,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'transportpce-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[transportpce] [odlparent] [yangtools] [controller]' @@ -66,7 +64,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'transportpce-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[transportpce] [odlparent] [yangtools] [controller]' @@ -84,5 +81,4 @@ project-name: 'transportpce' branch: 'master' mvn-settings: 'transportpce-settings' - mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index d1cae2d6a..eac2322d7 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'tsdr-settings' - mvn-goals: 'clean install javadoc:aggregate -DrepoBuild' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[tsdr]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'tsdr-settings' - mvn-goals: 'clean install javadoc:aggregate -DrepoBuild' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[tsdr]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'tsdr-settings' - mvn-goals: 'clean install javadoc:aggregate -DrepoBuild' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[tsdr]' @@ -86,5 +83,4 @@ project-name: 'tsdr' branch: 'master' mvn-settings: 'tsdr-settings' - mvn-goals: 'clean install javadoc:aggregate -DrepoBuild' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml index 41de1a0dd..dfd51dcc4 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'ttp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[ttp] [odlparent]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'ttp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[ttp] [odlparent]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'ttp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[ttp] [odlparent]' @@ -86,5 +83,4 @@ project-name: 'ttp' branch: 'master' mvn-settings: 'ttp-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 10f602889..5be5e8433 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'unimgr-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'ovsdb-merge-{stream}' email-upstream: '[unimgr] [ovsdb]' @@ -43,7 +42,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'unimgr-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'ovsdb-merge-{stream}' email-upstream: '[unimgr] [ovsdb]' @@ -71,7 +69,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'unimgr-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'ovsdb-merge-{stream}' email-upstream: '[unimgr] [ovsdb]' @@ -89,5 +86,4 @@ project-name: 'unimgr' branch: 'master' mvn-settings: 'unimgr-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index 86b4017fe..a1f374370 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -17,7 +17,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'usc-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' email-upstream: '[usc] [controller] [yangtools] [odlparent]' @@ -44,7 +43,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'usc-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' email-upstream: '[usc] [controller] [yangtools] [odlparent]' @@ -72,7 +70,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'usc-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' email-upstream: '[usc] [controller] [yangtools] [odlparent]' @@ -89,5 +86,4 @@ project-name: 'usc' branch: 'master' mvn-settings: 'usc-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml index 1efca00c4..a26e0bb87 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'usecplugin-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' email-upstream: '[usecplugin] [openflowplugin]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'usecplugin-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' email-upstream: '[usecplugin] [openflowplugin]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'usecplugin-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'openflowplugin-merge-{stream}' email-upstream: '[usecplugin] [openflowplugin]' @@ -86,5 +83,4 @@ project: 'usecplugin' project-name: 'usecplugin' mvn-settings: 'usecplugin-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml index fc38e865b..d8127f9e9 100644 --- a/jjb/yang-push/yang-push.yaml +++ b/jjb/yang-push/yang-push.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'yang-push-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[yang-push]' @@ -42,7 +41,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'yang-push-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[yang-push]' @@ -69,7 +67,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'yang-push-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: '' email-upstream: '[yang-push]' @@ -86,5 +83,4 @@ project-name: 'yang-push' branch: 'master' mvn-settings: 'yang-push-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml index cd0617c9c..6c61fe390 100644 --- a/jjb/yangide/yangide.yaml +++ b/jjb/yangide/yangide.yaml @@ -15,7 +15,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'yangide-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[yangide] [odlparent] [yangtools]' @@ -40,7 +39,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'yangide-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[yangide] [odlparent] [yangtools]' @@ -66,7 +64,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'yangide-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[yangide] [odlparent] [yangtools]' @@ -84,5 +81,4 @@ project-name: 'yangide' branch: 'master' mvn-settings: 'yangide-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index 2a67a52d7..54f6cb428 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -16,7 +16,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'yangtools-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' mvn-version: mvn33 @@ -52,7 +51,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'yangtools-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' mvn-version: mvn33 @@ -88,7 +86,6 @@ - mvn33: mvn-version: 'mvn33' mvn-settings: 'yangtools-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' mvn-version: mvn33 @@ -114,5 +111,4 @@ project-name: 'yangtools' branch: 'master' mvn-settings: 'yangtools-settings' - mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'