From: Robert Varga Date: Tue, 24 Sep 2019 11:31:14 +0000 (+0200) Subject: Remove all references to -XX:MaxPermSize X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=commitdiff_plain;h=fbb6852790ef13e01d614200cf9c9ac821105ef5 Remove all references to -XX:MaxPermSize This option has no effected (and has been deprecated) since Java 8, which is the lowest version we support. Remove any and all references to it. Change-Id: I670621ca18c0e1ad7ea6f130d54c8e31585c90ad Signed-off-by: Robert Varga --- diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 4319233dd..57d8973e1 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -16,7 +16,7 @@ project-name: 'aaa' branch: 'master' mvn-settings: 'aaa-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[aaa] [odlparent] [yangtools] [controller]' @@ -40,7 +40,7 @@ project-name: 'aaa' branch: 'stable/sodium' mvn-settings: 'aaa-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[aaa] [odlparent] [yangtools] [controller]' @@ -64,7 +64,7 @@ project-name: 'aaa' branch: 'stable/neon' mvn-settings: 'aaa-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[aaa] [odlparent] [yangtools] [controller]' @@ -88,7 +88,7 @@ project-name: 'aaa' branch: 'stable/fluorine' mvn-settings: 'aaa-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[aaa] [odlparent] [yangtools] [controller]' @@ -107,7 +107,7 @@ project-name: 'aaa' branch: 'master' mvn-settings: 'aaa-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: aaa-view diff --git a/jjb/alt-datastores/alt-datastores.yaml b/jjb/alt-datastores/alt-datastores.yaml index 6c276679a..5f3a87902 100644 --- a/jjb/alt-datastores/alt-datastores.yaml +++ b/jjb/alt-datastores/alt-datastores.yaml @@ -16,7 +16,7 @@ project-name: 'alt-datastores' branch: 'master' mvn-settings: 'alt-datastores-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[alt-datastores] [odlparent] [yangtools] [controller]' build-node: centos7-docker-2c-8g @@ -40,7 +40,7 @@ project-name: 'alt-datastores' branch: 'stable/sodium' mvn-settings: 'alt-datastores-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[alt-datastores] [odlparent] [yangtools] [controller]' build-node: centos7-docker-2c-8g @@ -64,7 +64,7 @@ project-name: 'alt-datastores' branch: 'stable/neon' mvn-settings: 'alt-datastores-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[alt-datastores] [odlparent] [yangtools] [controller]' build-node: centos7-docker-2c-8g @@ -84,7 +84,7 @@ project-name: 'alt-datastores' branch: 'master' mvn-settings: 'alt-datastores-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: alt-datastores-view diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index 78483f90d..620416c4e 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -12,7 +12,7 @@ branch: 'master' build-node: centos7-builder-2c-8g mvn-settings: 'alto-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'l2switch-merge-{stream}' email-upstream: '[alto] [l2switch]' disable-job: true @@ -32,7 +32,7 @@ branch: 'stable/sodium' build-node: centos7-builder-2c-8g mvn-settings: 'alto-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'l2switch-merge-{stream}' email-upstream: '[alto] [l2switch]' disable-job: true @@ -52,7 +52,7 @@ branch: 'stable/neon' build-node: centos7-builder-2c-8g mvn-settings: 'alto-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'l2switch-merge-{stream}' email-upstream: '[alto] [l2switch]' disable-job: true @@ -72,7 +72,7 @@ branch: 'stable/fluorine' build-node: centos7-builder-2c-8g mvn-settings: 'alto-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'l2switch-merge-{stream}' email-upstream: '[alto] [l2switch]' disable-job: true @@ -90,7 +90,7 @@ branch: 'master' build-node: centos7-builder-2c-8g mvn-settings: 'alto-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' disable-job: true - project: diff --git a/jjb/ansible/ansible.yaml b/jjb/ansible/ansible.yaml index 3bb9645fa..c39aba02b 100644 --- a/jjb/ansible/ansible.yaml +++ b/jjb/ansible/ansible.yaml @@ -21,7 +21,7 @@ project: ansible project-name: ansible mvn-settings: 'netvirt-settings' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m' + mvn-opts: '-Xmx2048m' build-node: centos7-builder-2c-2g build-timeout: 60 staging-profile-id: 'da5a90345bd62' diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml index a119315b2..217bdddcc 100644 --- a/jjb/autorelease/autorelease-macros.yaml +++ b/jjb/autorelease/autorelease-macros.yaml @@ -66,7 +66,7 @@ -DappendOutput {opendaylight-infra-mvn-opts} java-opts: - - '-Xmx4096m -XX:MaxPermSize=1024m' + - '-Xmx4096m' settings: '{settings}' settings-type: cfp global-settings: '{global-settings}' diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index cac8fb9ae..cb434a3b0 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -65,7 +65,7 @@ java-version: '{java-version}' mvn-global-settings: global-settings mvn-goals: clean deploy - mvn-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx8g -Dmaven.compile.fork=true' mvn-params: '' mvn-settings: autorelease-settings mvn-version: mvn35 @@ -602,7 +602,7 @@ -Pq {opendaylight-infra-mvn-opts} java-opts: - - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + - '-Xmx8g -Dmaven.compile.fork=true' settings: '{mvn-settings}' settings-type: cfp global-settings: '{mvn-global-settings}' diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 4cd136839..3bc5bc158 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -19,7 +19,7 @@ build-timeout: 120 branch: 'master' mvn-settings: 'bgpcep-settings' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx2048m' dependencies: > odlparent-merge-{stream}, yangtools-merge-{stream}, @@ -50,7 +50,7 @@ build-timeout: 120 branch: 'stable/sodium' mvn-settings: 'bgpcep-settings' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx2048m' dependencies: > odlparent-merge-{stream}, yangtools-merge-{stream}, @@ -81,7 +81,7 @@ build-timeout: 120 branch: 'stable/neon' mvn-settings: 'bgpcep-settings' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx2048m' dependencies: > odlparent-merge-{stream}, yangtools-merge-{stream}, @@ -112,7 +112,7 @@ build-timeout: 120 branch: 'stable/fluorine' mvn-settings: 'bgpcep-settings' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx2048m' dependencies: > odlparent-merge-{stream}, yangtools-merge-{stream}, @@ -138,7 +138,7 @@ build-timeout: 120 branch: 'master' mvn-settings: 'bgpcep-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: bgpcep-view diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index 119cb9d5b..9a01f1090 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -13,7 +13,7 @@ build-node: centos7-builder-2c-8g build-timeout: 90 mvn-settings: 'bier-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[bier]' disable-job: true @@ -34,7 +34,7 @@ build-node: centos7-builder-2c-8g build-timeout: 90 mvn-settings: 'bier-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[bier]' disable-job: true @@ -55,7 +55,7 @@ build-node: centos7-builder-2c-8g build-timeout: 90 mvn-settings: 'bier-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[bier]' disable-job: true @@ -76,7 +76,7 @@ build-node: centos7-builder-2c-8g build-timeout: 90 mvn-settings: 'bier-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[bier]' disable-job: true @@ -94,7 +94,7 @@ branch: 'master' build-node: centos7-builder-2c-8g mvn-settings: 'bier-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' disable-job: true - project: diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index d321a2ac3..fcab50d23 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -16,7 +16,7 @@ stream: magnesium branch: 'master' mvn-settings: 'coe-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[coe] [odlparent] [yangtools] [controller]' build-node: centos7-docker-2c-8g @@ -41,7 +41,7 @@ stream: sodium branch: 'stable/sodium' mvn-settings: 'coe-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[coe] [odlparent] [yangtools] [controller]' build-node: centos7-docker-2c-8g @@ -66,7 +66,7 @@ stream: neon branch: 'stable/neon' mvn-settings: 'coe-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[coe] [odlparent] [yangtools] [controller]' build-node: centos7-docker-2c-8g @@ -91,7 +91,7 @@ stream: fluorine branch: 'stable/fluorine' mvn-settings: 'coe-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[coe] [odlparent] [yangtools] [controller]' build-node: centos7-docker-2c-8g @@ -108,7 +108,7 @@ project-name: 'coe' branch: 'master' mvn-settings: 'coe-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: coe-view diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 5fa9577c1..7fca1f9a9 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -17,7 +17,7 @@ branch: 'master' mvn-settings: 'controller-settings' mvn-goals: 'clean deploy -Pintegrationtests,docs' - mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true' build-node: centos7-builder-8c-8g build-timeout: 90 dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' @@ -44,7 +44,7 @@ branch: 'stable/sodium' mvn-settings: 'controller-settings' mvn-goals: 'clean deploy -Pintegrationtests,docs' - mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true' build-node: centos7-builder-8c-8g build-timeout: 90 dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' @@ -72,7 +72,7 @@ branch: 'stable/neon' mvn-settings: 'controller-settings' mvn-goals: 'clean deploy -Pintegrationtests,docs' - mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true' build-node: centos7-builder-8c-8g build-timeout: 90 dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' @@ -100,7 +100,7 @@ branch: 'stable/fluorine' mvn-settings: 'controller-settings' mvn-goals: 'clean deploy -Pintegrationtests,docs' - mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true' build-node: centos7-builder-8c-8g build-timeout: 90 dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' @@ -123,7 +123,7 @@ build-node: centos7-builder-8c-8g mvn-settings: 'controller-settings' mvn-goals: 'clean deploy -Pintegrationtests,docs' - mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true' - project: name: controller-view diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index b9fedfb97..712837e66 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -16,7 +16,7 @@ stream: magnesium branch: 'master' mvn-settings: 'daexim-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[daexim] [odlparent] [yangtools] [controller]' @@ -40,7 +40,7 @@ stream: sodium branch: 'stable/sodium' mvn-settings: 'daexim-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[daexim] [odlparent] [yangtools] [controller]' @@ -64,7 +64,7 @@ stream: neon branch: 'stable/neon' mvn-settings: 'daexim-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[daexim] [odlparent] [yangtools] [controller]' @@ -88,7 +88,7 @@ stream: fluorine branch: 'stable/fluorine' mvn-settings: 'daexim-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[daexim] [odlparent] [yangtools] [controller]' @@ -104,7 +104,7 @@ project-name: 'daexim' branch: 'master' mvn-settings: 'daexim-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: daexim-view diff --git a/jjb/detnet/detnet.yaml b/jjb/detnet/detnet.yaml index 24c86c2fe..eeabc40ac 100644 --- a/jjb/detnet/detnet.yaml +++ b/jjb/detnet/detnet.yaml @@ -16,7 +16,7 @@ project-name: 'detnet' branch: 'master' mvn-settings: 'detnet-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[detnet] [odlparent] [yangtools] [controller]' build-node: centos7-docker-2c-8g @@ -40,7 +40,7 @@ project-name: 'detnet' branch: 'stable/sodium' mvn-settings: 'detnet-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[detnet] [odlparent] [yangtools] [controller]' build-node: centos7-docker-2c-8g @@ -60,7 +60,7 @@ project-name: 'detnet' branch: 'master' mvn-settings: 'detnet-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: detnet-view diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index ef2018356..ed0259c12 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -11,7 +11,7 @@ project-name: 'dlux' branch: 'master' mvn-settings: 'dlux-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[dlux] [odlparent]' disable-job: true @@ -30,7 +30,7 @@ project-name: 'dlux' branch: 'stable/sodium' mvn-settings: 'dlux-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[dlux] [odlparent]' disable-job: true @@ -49,7 +49,7 @@ project-name: 'dlux' branch: 'stable/neon' mvn-settings: 'dlux-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[dlux] [odlparent]' disable-job: true @@ -68,7 +68,7 @@ project-name: 'dlux' branch: 'stable/fluorine' mvn-settings: 'dlux-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[dlux] [odlparent]' disable-job: true @@ -84,7 +84,7 @@ project-name: 'dlux' branch: 'master' mvn-settings: 'dlux-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' disable-job: true - project: diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index 535ddbebb..60c373bb0 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -12,7 +12,7 @@ branch: 'master' build-node: centos7-builder-2c-8g mvn-settings: 'dluxapps-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]' disable-job: true @@ -32,7 +32,7 @@ branch: 'stable/sodium' build-node: centos7-builder-2c-8g mvn-settings: 'dluxapps-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]' disable-job: true @@ -52,7 +52,7 @@ branch: 'stable/neon' build-node: centos7-builder-2c-8g mvn-settings: 'dluxapps-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]' disable-job: true @@ -72,7 +72,7 @@ branch: 'stable/fluorine' build-node: centos7-builder-2c-8g mvn-settings: 'dluxapps-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]' disable-job: true @@ -90,7 +90,7 @@ branch: 'master' build-node: centos7-builder-2c-8g mvn-settings: 'dluxapps-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: dluxapps-view diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index d8ea15718..45fe54fd4 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -21,7 +21,7 @@ branch: 'master' build-node: centos7-builder-2c-8g mvn-settings: 'genius-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' build-timeout: 90 dependencies: > controller-merge-{stream}, @@ -56,7 +56,7 @@ branch: 'stable/sodium' build-node: centos7-builder-2c-8g mvn-settings: 'genius-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' build-timeout: 90 dependencies: > controller-merge-{stream}, @@ -91,7 +91,7 @@ branch: 'stable/neon' build-node: centos7-builder-2c-8g mvn-settings: 'genius-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' build-timeout: 90 dependencies: > controller-merge-{stream}, @@ -123,7 +123,7 @@ branch: 'stable/fluorine' build-node: centos7-builder-2c-8g mvn-settings: 'genius-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' build-timeout: 90 dependencies: > controller-merge-{stream}, @@ -145,7 +145,7 @@ branch: 'master' build-node: centos7-builder-2c-8g mvn-settings: 'genius-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: genius-view diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index 9254eadb9..5eac9bdaf 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -13,7 +13,7 @@ build-node: centos7-builder-2c-8g mvn-settings: 'groupbasedpolicy-settings' mvn-goals: '-U clean deploy findbugs:findbugs' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' build-timeout: 90 dependencies: > openflowjava-merge-{stream}, @@ -40,7 +40,7 @@ build-node: centos7-builder-2c-8g mvn-settings: 'groupbasedpolicy-settings' mvn-goals: '-U clean deploy findbugs:findbugs' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' build-timeout: 90 dependencies: > openflowjava-merge-{stream}, @@ -67,7 +67,7 @@ build-node: centos7-builder-2c-8g mvn-settings: 'groupbasedpolicy-settings' mvn-goals: '-U clean deploy findbugs:findbugs' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' build-timeout: 90 dependencies: > openflowjava-merge-{stream}, @@ -94,7 +94,7 @@ build-node: centos7-builder-2c-8g mvn-settings: 'groupbasedpolicy-settings' mvn-goals: '-U clean deploy findbugs:findbugs' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' build-timeout: 90 dependencies: > openflowjava-merge-{stream}, @@ -118,7 +118,7 @@ build-node: centos7-builder-2c-8g mvn-settings: 'groupbasedpolicy-settings' mvn-goals: '-U clean deploy findbugs:findbugs' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' disable-job: true - project: diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index d3d5587ff..f60f1431e 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -11,7 +11,7 @@ project-name: 'vbd' branch: 'master' mvn-settings: 'honeycomb-vbd-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[vbd]' @@ -29,7 +29,7 @@ project-name: 'vbd' branch: 'stable/sodium' mvn-settings: 'honeycomb-vbd-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[vbd]' @@ -47,7 +47,7 @@ project-name: 'vbd' branch: 'stable/neon' mvn-settings: 'honeycomb-vbd-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[vbd]' @@ -65,7 +65,7 @@ project-name: 'vbd' branch: 'stable/fluorine' mvn-settings: 'honeycomb-vbd-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[vbd]' @@ -80,7 +80,7 @@ project-name: 'vbd' branch: 'master' mvn-settings: 'honeycomb-vbd-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: vbd-view diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index bb4cff758..d0a2349f8 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -18,7 +18,7 @@ project-name: 'infrautils' branch: 'master' mvn-settings: 'infrautils-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[infrautils] [odlparent]' @@ -44,7 +44,7 @@ project-name: 'infrautils' branch: 'stable/sodium' mvn-settings: 'infrautils-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[infrautils] [odlparent]' @@ -70,7 +70,7 @@ project-name: 'infrautils' branch: 'stable/neon' mvn-settings: 'infrautils-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[infrautils] [odlparent]' @@ -96,7 +96,7 @@ project-name: 'infrautils' branch: 'stable/fluorine' mvn-settings: 'infrautils-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[infrautils] [odlparent]' @@ -111,7 +111,7 @@ project-name: 'infrautils' branch: 'master' mvn-settings: 'infrautils-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: infrautils-view diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index c71fbdfe7..c8544707a 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -16,7 +16,7 @@ project-name: distribution mvn-settings: integration-distribution-settings mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' nexus-iq-namespace: odl- nexus-iq-stage: release email-upstream: '[int/dist]' @@ -69,7 +69,7 @@ project-name: distribution mvn-settings: integration-distribution-settings mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' email-upstream: '[int/dist]' type: managed profile: '-Pmanaged' @@ -166,7 +166,7 @@ project-name: distribution mvn-settings: integration-distribution-settings mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' email-upstream: '[int/dist]' type: full profile: '-Punmanaged' @@ -210,7 +210,7 @@ project-name: 'distribution' mvn-goals: 'clean deploy -f opendaylight/pom.xml' mvn-settings: 'integration-distribution-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' email-upstream: '[int/dist]' # Used by the release job @@ -236,7 +236,7 @@ branch: master mvn-settings: integration-distribution-settings mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: distribution-view diff --git a/jjb/integration/distribution/distribution-macros.yaml b/jjb/integration/distribution/distribution-macros.yaml index 1579fb2bb..474e9a6d4 100644 --- a/jjb/integration/distribution/distribution-macros.yaml +++ b/jjb/integration/distribution/distribution-macros.yaml @@ -46,7 +46,7 @@ -DaltDeploymentRepository=fake-nexus::default::file:///tmp/n/ {mvn-opts} java-opts: - - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + - '-Xmx4096m -Dmaven.compile.fork=true' settings: 'integration-settings' settings-type: cfp global-settings: 'global-settings' @@ -97,7 +97,7 @@ -Pq {mvn-opts} java-opts: - - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + - '-Xmx1024m -Dmaven.compile.fork=true' settings: 'integration-settings' settings-type: cfp global-settings: 'global-settings' @@ -202,7 +202,7 @@ -Pq {mvn-opts} java-opts: - - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + - '-Xmx4096m -Dmaven.compile.fork=true' - shell: | rm -rf /tmp/r mv /tmp/t /tmp/r @@ -230,7 +230,7 @@ -DskipTests=false {mvn-opts} java-opts: - - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + - '-Xmx1024m -Dmaven.compile.fork=true' - builder: name: distribution-check-warn-9191 diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml index b12ff84ce..c22250347 100644 --- a/jjb/integration/distribution/distribution-templates.yaml +++ b/jjb/integration/distribution/distribution-templates.yaml @@ -183,7 +183,7 @@ {profile} # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT. java-opts: - - '-Xmx1024m -XX:MaxPermSize=256m' + - '-Xmx1024m' settings: integration-settings settings-type: cfp global-settings: global-settings @@ -264,7 +264,7 @@ -Dsft.heap.max=4g -Djenkins -Dmerge -Dstream={stream} {profile} - maven-opts: '-Xmx1024m -XX:MaxPermSize=256m' + maven-opts: '-Xmx1024m' settings: integration-settings settings-type: cfp global-settings: global-settings diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 010a1c4e8..6ec8a5275 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -1923,7 +1923,7 @@ {opendaylight-infra-mvn-opts} # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT. java-opts: - - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + - '-Xmx4096m -Dmaven.compile.fork=true' settings: integration-settings settings-type: cfp global-settings: global-settings @@ -1939,7 +1939,7 @@ {opendaylight-infra-mvn-opts} # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT. java-opts: - - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + - '-Xmx1024m -Dmaven.compile.fork=true' settings: integration-settings settings-type: cfp global-settings: global-settings diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 07b29952b..8c889f495 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -342,7 +342,7 @@ {opendaylight-infra-mvn-opts} # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT. java-opts: - - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + - '-Xmx4096m -Dmaven.compile.fork=true' settings: integration-settings settings-type: cfp global-settings: global-settings @@ -355,7 +355,7 @@ {opendaylight-infra-mvn-opts} # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT. java-opts: - - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + - '-Xmx1024m -Dmaven.compile.fork=true' settings: integration-settings settings-type: cfp global-settings: global-settings diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 2e042a116..874cd397e 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -16,7 +16,7 @@ stream: magnesium branch: 'master' mvn-settings: 'jsonrpc-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' @@ -39,7 +39,7 @@ stream: sodium branch: 'stable/sodium' mvn-settings: 'jsonrpc-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' @@ -62,7 +62,7 @@ stream: neon branch: 'stable/neon' mvn-settings: 'jsonrpc-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' @@ -80,7 +80,7 @@ stream: fluorine branch: 'stable/fluorine' mvn-settings: 'jsonrpc-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}' email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]' @@ -96,7 +96,7 @@ project-name: 'jsonrpc' branch: 'master' mvn-settings: 'jsonrpc-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: jsonrpc-view diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index f412f6327..173a66549 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -11,7 +11,7 @@ project-name: 'l2switch' branch: 'master' mvn-settings: 'l2switch-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true' dependencies: > odlparent-merge-{stream}, yangtools-merge-{stream}, @@ -35,7 +35,7 @@ project-name: 'l2switch' branch: 'stable/sodium' mvn-settings: 'l2switch-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true' dependencies: > odlparent-merge-{stream}, yangtools-merge-{stream}, @@ -59,7 +59,7 @@ project-name: 'l2switch' branch: 'stable/neon' mvn-settings: 'l2switch-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true' dependencies: > odlparent-merge-{stream}, yangtools-merge-{stream}, @@ -83,7 +83,7 @@ project-name: 'l2switch' branch: 'stable/fluorine' mvn-settings: 'l2switch-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true' dependencies: > odlparent-merge-{stream}, yangtools-merge-{stream}, @@ -104,7 +104,7 @@ project-name: 'l2switch' branch: 'master' mvn-settings: 'l2switch-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true' disable-job: true - project: diff --git a/jjb/lf-infra/zzz-test-release.yaml b/jjb/lf-infra/zzz-test-release.yaml index 806a52d69..679296798 100644 --- a/jjb/lf-infra/zzz-test-release.yaml +++ b/jjb/lf-infra/zzz-test-release.yaml @@ -9,7 +9,7 @@ branch: master distribution_branch: master mvn-settings: autorelease-settings - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' mvn-version: mvn35 dependencies: '' email-upstream: '[odlparent]' diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 8816284dd..394e5b580 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -20,7 +20,7 @@ branch: 'master' mvn-settings: 'lispflowmapping-settings' mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true' dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}' email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]' archive-artifacts: > @@ -53,7 +53,7 @@ branch: 'stable/sodium' mvn-settings: 'lispflowmapping-settings' mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true' dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}' email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]' archive-artifacts: > @@ -86,7 +86,7 @@ branch: 'stable/neon' mvn-settings: 'lispflowmapping-settings' mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true' dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}' email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]' archive-artifacts: > @@ -117,7 +117,7 @@ branch: 'stable/fluorine' mvn-settings: 'lispflowmapping-settings' mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true' dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}' email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]' archive-artifacts: > @@ -138,7 +138,7 @@ branch: 'master' mvn-settings: 'lispflowmapping-settings' mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true' - project: name: lispflowmapping-view diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 06b917837..6de9899b7 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -11,7 +11,7 @@ project-name: 'nemo' branch: 'master' mvn-settings: 'nemo-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[nemo]' disable-job: true @@ -30,7 +30,7 @@ project-name: 'nemo' branch: 'stable/sodium' mvn-settings: 'nemo-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[nemo]' disable-job: true @@ -49,7 +49,7 @@ project-name: 'nemo' branch: 'stable/neon' mvn-settings: 'nemo-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[nemo]' disable-job: true @@ -68,7 +68,7 @@ project-name: 'nemo' branch: 'stable/fluorine' mvn-settings: 'nemo-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[nemo]' disable-job: true @@ -84,7 +84,7 @@ project-name: 'nemo' branch: 'master' mvn-settings: 'nemo-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' disable-job: true - project: diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index b465938c8..8ac937f95 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -18,7 +18,7 @@ build-node: centos7-builder-2c-8g mvn-settings: 'netconf-settings' mvn-goals: 'clean deploy -Pintegrationtests' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true' build-timeout: 90 dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' @@ -45,7 +45,7 @@ build-node: centos7-builder-2c-8g mvn-settings: 'netconf-settings' mvn-goals: 'clean deploy -Pintegrationtests' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true' build-timeout: 90 dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' @@ -72,7 +72,7 @@ build-node: centos7-builder-2c-8g mvn-settings: 'netconf-settings' mvn-goals: 'clean deploy -Pintegrationtests' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true' build-timeout: 90 dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' @@ -99,7 +99,7 @@ build-node: centos7-builder-2c-8g mvn-settings: 'netconf-settings' mvn-goals: 'clean deploy -Pintegrationtests' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true' build-timeout: 90 dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}' email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' @@ -121,7 +121,7 @@ build-node: centos7-builder-2c-8g mvn-settings: 'netconf-settings' mvn-goals: 'clean deploy -Pintegrationtests' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true' build-timeout: 90 - project: diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index b776eb557..709e9fd98 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -30,7 +30,7 @@ project: 'netvirt' project-name: 'netvirt' mvn-settings: 'netvirt-settings' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m' + mvn-opts: '-Xmx2048m' build-timeout: 90 build-node: centos7-builder-8c-8g dependencies: > @@ -54,7 +54,7 @@ project-name: 'netvirt' branch: 'master' mvn-settings: 'netvirt-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: netvirt-csit-view diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 761d2b733..10c2a8164 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -13,7 +13,7 @@ build-timeout: 90 branch: 'master' mvn-settings: 'neutron-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' email-upstream: '[neutron] [odlparent] [aaa]' @@ -34,7 +34,7 @@ build-timeout: 90 branch: 'stable/sodium' mvn-settings: 'neutron-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' email-upstream: '[neutron] [odlparent] [aaa]' @@ -55,7 +55,7 @@ build-timeout: 90 branch: 'stable/neon' mvn-settings: 'neutron-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' email-upstream: '[neutron] [odlparent] [aaa]' @@ -76,7 +76,7 @@ build-timeout: 90 branch: 'stable/fluorine' mvn-settings: 'neutron-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' email-upstream: '[neutron] [odlparent] [aaa]' disable-job: true @@ -92,7 +92,7 @@ project-name: 'neutron' branch: 'master' mvn-settings: 'neutron-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: neutron-view diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index 1f35a5edb..4d873e6dc 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -11,7 +11,7 @@ project-name: 'of-config' branch: 'master' mvn-settings: 'of-config-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: netconf-merge-{stream}' email-upstream: '[of-config] [netconf]' disable-job: true @@ -30,7 +30,7 @@ project-name: 'of-config' branch: 'stable/sodium' mvn-settings: 'of-config-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: netconf-merge-{stream}' email-upstream: '[of-config] [netconf]' disable-job: true @@ -49,7 +49,7 @@ project-name: 'of-config' branch: 'stable/neon' mvn-settings: 'of-config-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: netconf-merge-{stream}' email-upstream: '[of-config] [netconf]' disable-job: true @@ -68,7 +68,7 @@ project-name: 'of-config' branch: 'stable/fluorine' mvn-settings: 'of-config-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: netconf-merge-{stream}' email-upstream: '[of-config] [netconf]' disable-job: true @@ -84,7 +84,7 @@ project-name: 'of-config' branch: 'master' mvn-settings: 'of-config-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' disable-job: true - project: diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 1b219c6dd..24ab553bd 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -24,7 +24,7 @@ build-timeout: 90 mvn-settings: 'openflowplugin-settings' mvn-goals: 'clean deploy javadoc:aggregate' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: > odlparent-merge-{stream}, yangtools-merge-{stream}, @@ -60,7 +60,7 @@ build-timeout: 90 mvn-settings: 'openflowplugin-settings' mvn-goals: 'clean deploy javadoc:aggregate' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: > odlparent-merge-{stream}, yangtools-merge-{stream}, @@ -96,7 +96,7 @@ build-timeout: 90 mvn-settings: 'openflowplugin-settings' mvn-goals: 'clean deploy javadoc:aggregate' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: > odlparent-merge-{stream}, yangtools-merge-{stream}, @@ -129,7 +129,7 @@ build-timeout: 90 mvn-settings: 'openflowplugin-settings' mvn-goals: 'clean deploy javadoc:aggregate' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: > odlparent-merge-{stream}, yangtools-merge-{stream}, @@ -152,7 +152,7 @@ build-timeout: 90 mvn-settings: 'openflowplugin-settings' mvn-goals: 'clean deploy javadoc:aggregate' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: openflowplugin-view diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 9f568f17f..a779b636a 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -35,7 +35,7 @@ - 'org.ops4j.pax.url.mvn.localRepository=/tmp/r' - 'stream={stream}' java-opts: - - '-Xmx1024m -XX:MaxPermSize=256m' + - '-Xmx1024m' settings: 'ovsdb-settings' settings-type: cfp global-settings: 'global-settings' @@ -156,7 +156,7 @@ - 'org.ops4j.pax.url.mvn.localRepository=/tmp/r' - 'stream={stream}' java-opts: - - '-Xmx1024m -XX:MaxPermSize=256m' + - '-Xmx1024m' settings: 'ovsdb-settings' settings-type: cfp global-settings: 'global-settings' diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml index 521a9098e..a223c5420 100644 --- a/jjb/ovsdb/ovsdb-sonar.yaml +++ b/jjb/ovsdb/ovsdb-sonar.yaml @@ -67,7 +67,7 @@ -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r java-opts: - - '-Xmx1024m -XX:MaxPermSize=256m' + - '-Xmx1024m' settings: 'ovsdb-settings' settings-type: cfp global-settings: 'global-settings' diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 1b63dc0ab..487a7eda0 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -21,7 +21,7 @@ branch: 'master' build-node: centos7-builder-2c-8g mvn-settings: 'ovsdb-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' @@ -50,7 +50,7 @@ branch: 'stable/sodium' build-node: centos7-builder-2c-8g mvn-settings: 'ovsdb-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' @@ -79,7 +79,7 @@ branch: 'stable/neon' build-node: centos7-builder-2c-8g mvn-settings: 'ovsdb-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' @@ -105,7 +105,7 @@ branch: 'stable/fluorine' build-node: centos7-builder-2c-8g mvn-settings: 'ovsdb-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' 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 1762c8163..1c573655d 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -12,7 +12,7 @@ project-name: 'p4plugin' branch: 'master' mvn-settings: 'p4plugin-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[p4plugin]' @@ -31,7 +31,7 @@ project-name: 'p4plugin' branch: 'stable/sodium' mvn-settings: 'p4plugin-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[p4plugin]' @@ -50,7 +50,7 @@ project-name: 'p4plugin' branch: 'stable/neon' mvn-settings: 'p4plugin-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[p4plugin]' @@ -69,7 +69,7 @@ project-name: 'p4plugin' branch: 'stable/fluorine' mvn-settings: 'p4plugin-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[p4plugin]' @@ -85,7 +85,7 @@ project-name: 'p4plugin' branch: 'master' mvn-settings: 'p4plugin-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: p4plugin-view diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 4d818de05..3abb57ba7 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -11,7 +11,7 @@ project-name: 'packetcable' branch: 'master' mvn-settings: 'packetcable-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[packetcable]' disable-job: true @@ -30,7 +30,7 @@ project-name: 'packetcable' branch: 'stable/sodium' mvn-settings: 'packetcable-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[packetcable]' disable-job: true @@ -49,7 +49,7 @@ project-name: 'packetcable' branch: 'stable/neon' mvn-settings: 'packetcable-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[packetcable]' disable-job: true @@ -68,7 +68,7 @@ project-name: 'packetcable' branch: 'stable/fluorine' mvn-settings: 'packetcable-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[packetcable]' disable-job: true @@ -84,7 +84,7 @@ project-name: 'packetcable' branch: 'master' mvn-settings: 'packetcable-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' disable-job: true - project: diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index e4b38d51e..566bc9705 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -26,7 +26,7 @@ project-name: 'serviceutils' build-node: centos7-builder-2c-2g mvn-settings: 'serviceutils-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' build-timeout: 90 dependencies: > controller-merge-{stream}, @@ -48,7 +48,7 @@ branch: 'master' build-node: centos7-builder-4c-4g mvn-settings: 'serviceutils-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: serviceutils-view diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index cccf363a3..4ab2ba40e 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -16,7 +16,7 @@ project-name: 'sfc' branch: 'master' mvn-settings: 'sfc-settings' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true' build-timeout: 120 dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' @@ -42,7 +42,7 @@ project-name: 'sfc' branch: 'stable/sodium' mvn-settings: 'sfc-settings' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true' build-timeout: 120 dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' @@ -68,7 +68,7 @@ project-name: 'sfc' branch: 'stable/neon' mvn-settings: 'sfc-settings' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true' build-timeout: 120 dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' @@ -94,7 +94,7 @@ project-name: 'sfc' branch: 'stable/fluorine' mvn-settings: 'sfc-settings' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true' build-timeout: 120 dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' @@ -111,7 +111,7 @@ project-name: 'sfc' branch: 'master' mvn-settings: 'sfc-settings' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' + mvn-opts: '-Xmx2048m -Dmaven.compile.fork=true' - project: name: sfc-view diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 95f1a3314..3668a510a 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -11,7 +11,7 @@ project-name: 'snmp' branch: 'master' mvn-settings: 'snmp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[snmp] [odlparent]' @@ -29,7 +29,7 @@ project-name: 'snmp' branch: 'stable/sodium' mvn-settings: 'snmp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[snmp] [odlparent]' @@ -47,7 +47,7 @@ project-name: 'snmp' branch: 'stable/neon' mvn-settings: 'snmp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[snmp] [odlparent]' @@ -65,7 +65,7 @@ project-name: 'snmp' branch: 'stable/fluorine' mvn-settings: 'snmp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream}' email-upstream: '[snmp] [odlparent]' @@ -80,7 +80,7 @@ project-name: 'snmp' branch: 'master' mvn-settings: 'snmp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: snmp-view diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index 4d06b4deb..6d18b120f 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -16,7 +16,7 @@ project-name: 'snmp4sdn' branch: 'master' mvn-settings: 'snmp4sdn-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' @@ -39,7 +39,7 @@ project-name: 'snmp4sdn' branch: 'stable/sodium' mvn-settings: 'snmp4sdn-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' @@ -62,7 +62,7 @@ project-name: 'snmp4sdn' branch: 'stable/neon' mvn-settings: 'snmp4sdn-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' @@ -85,7 +85,7 @@ project-name: 'snmp4sdn' branch: 'stable/fluorine' mvn-settings: 'snmp4sdn-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' @@ -101,7 +101,7 @@ project-name: 'snmp4sdn' branch: 'master' mvn-settings: 'snmp4sdn-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: snmp4sdn-view diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index a85b4f109..04cfa1a4e 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -20,7 +20,7 @@ branch: 'master' mvn-settings: 'sxp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[sxp] [odlparent] [controller] [yangtools]' @@ -48,7 +48,7 @@ branch: 'stable/sodium' mvn-settings: 'sxp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[sxp] [odlparent] [controller] [yangtools]' @@ -76,7 +76,7 @@ branch: 'stable/neon' mvn-settings: 'sxp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[sxp] [odlparent] [controller] [yangtools]' @@ -100,7 +100,7 @@ project-name: 'sxp' branch: 'stable/fluorine' mvn-settings: 'sxp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' email-upstream: '[sxp] [odlparent] [controller] [yangtools]' @@ -115,7 +115,7 @@ project-name: 'sxp' branch: 'master' mvn-settings: 'sxp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: sxp-view diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml index e5f2ca1ab..0077d0b24 100644 --- a/jjb/telemetry/telemetry.yaml +++ b/jjb/telemetry/telemetry.yaml @@ -17,7 +17,7 @@ project-name: 'telemetry' branch: 'master' mvn-settings: 'telemetry-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[telemetry]' archive-artifacts: '' @@ -42,7 +42,7 @@ project-name: 'telemetry' branch: 'stable/sodium' mvn-settings: 'telemetry-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[telemetry]' archive-artifacts: '' @@ -67,7 +67,7 @@ project-name: 'telemetry' branch: 'stable/neon' mvn-settings: 'telemetry-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[telemetry]' archive-artifacts: '' @@ -87,7 +87,7 @@ project-name: 'telemetry' branch: 'stable/fluorine' mvn-settings: 'telemetry-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[telemetry]' archive-artifacts: '' @@ -105,7 +105,7 @@ branch: 'master' mvn-settings: 'telemetry-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: telemetry-view diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index a71a39461..252e8e9b6 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -19,7 +19,7 @@ stream: magnesium branch: 'master' mvn-settings: 'transportpce-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[transportpce] [odlparent] [yangtools] [controller]' @@ -45,7 +45,7 @@ stream: sodium branch: 'stable/sodium' mvn-settings: 'transportpce-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[transportpce] [odlparent] [yangtools] [controller]' @@ -71,7 +71,7 @@ stream: neon branch: 'stable/neon' mvn-settings: 'transportpce-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[transportpce] [odlparent] [yangtools] [controller]' @@ -94,7 +94,7 @@ stream: fluorine branch: 'stable/fluorine' mvn-settings: 'transportpce-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' email-upstream: '[transportpce] [odlparent] [yangtools] [controller]' @@ -110,7 +110,7 @@ project-name: 'transportpce' branch: 'master' mvn-settings: 'transportpce-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: transportpce-view diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index de4a737f9..6e6ae6e0d 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -16,7 +16,7 @@ project-name: 'tsdr' branch: 'master' mvn-settings: 'tsdr-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[tsdr]' @@ -39,7 +39,7 @@ project-name: 'tsdr' branch: 'stable/sodium' mvn-settings: 'tsdr-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[tsdr]' @@ -62,7 +62,7 @@ project-name: 'tsdr' branch: 'stable/neon' mvn-settings: 'tsdr-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[tsdr]' @@ -85,7 +85,7 @@ project-name: 'tsdr' branch: 'stable/fluorine' mvn-settings: 'tsdr-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: '' email-upstream: '[tsdr]' @@ -100,7 +100,7 @@ project-name: 'tsdr' branch: 'master' mvn-settings: 'tsdr-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: tsdr-view diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 0f1ce0c99..662dd6aaf 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -16,7 +16,7 @@ project-name: 'unimgr' branch: 'master' mvn-settings: 'unimgr-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'ovsdb-merge-{stream}' email-upstream: '[unimgr] [ovsdb]' build-node: centos7-builder-4c-16g @@ -40,7 +40,7 @@ project-name: 'unimgr' branch: 'stable/sodium' mvn-settings: 'unimgr-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'ovsdb-merge-{stream}' email-upstream: '[unimgr] [ovsdb]' build-node: centos7-builder-4c-16g @@ -64,7 +64,7 @@ project-name: 'unimgr' branch: 'stable/neon' mvn-settings: 'unimgr-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'ovsdb-merge-{stream}' email-upstream: '[unimgr] [ovsdb]' build-node: centos7-builder-4c-16g @@ -88,7 +88,7 @@ project-name: 'unimgr' branch: 'stable/fluorine' mvn-settings: 'unimgr-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'ovsdb-merge-{stream}' email-upstream: '[unimgr] [ovsdb]' build-node: centos7-builder-4c-16g @@ -106,7 +106,7 @@ project-name: 'unimgr' branch: 'master' mvn-settings: 'unimgr-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: unimgr-view diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index 81cee7faf..df3113b5e 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -12,7 +12,7 @@ project-name: 'usc' branch: 'master' mvn-settings: 'usc-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' email-upstream: '[usc] [controller] [yangtools] [odlparent]' @@ -31,7 +31,7 @@ project-name: 'usc' branch: 'stable/sodium' mvn-settings: 'usc-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' email-upstream: '[usc] [controller] [yangtools] [odlparent]' @@ -50,7 +50,7 @@ project-name: 'usc' branch: 'stable/neon' mvn-settings: 'usc-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' email-upstream: '[usc] [controller] [yangtools] [odlparent]' @@ -69,7 +69,7 @@ project-name: 'usc' branch: 'stable/fluorine' mvn-settings: 'usc-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' email-upstream: '[usc] [controller] [yangtools] [odlparent]' @@ -85,7 +85,7 @@ project-name: 'usc' branch: 'master' mvn-settings: 'usc-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: usc-view