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 <robert.varga@pantheon.tech>

diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml
index 4319233dd0155caf020e257544a8419b55051987..57d8973e118ba454fbbb5aac715c0166011b5a2c 100644 (file)
--- 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 6c276679ad3aa84fcf3958bc26cb90e34a9473bd..5f3a8790236af7a4d9b844b197d8c7c5d5a0528b 100644 (file)
--- 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 78483f90d1f63e15d96ac0a6094dccb3867ec7eb..620416c4ecccb842947172369c057549393075c1 100644 (file)
--- 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 3bb9645fad76be6f774eafcaf86f212486e687c4..c39aba02bdd27f09eabb89492b7f42e60b341dd2 100644 (file)
--- 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 a119315b2cba613b97b9434bc60725c23c04e48b..217bdddcc184ce28cf0edc3ca6ac261a65a51a08 100644 (file)
--- 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 cac8fb9ae63fe7e3e716d3b0c46616078b80f7d5..cb434a3b0760128cfafb9a0396a2995f271f6227 100644 (file)
--- 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 4cd136839e109d1dc5f5bacf93e8e8c6d8665e3b..3bc5bc158a81e354c7d3eed0e0226ba2c1560916 100644 (file)
--- 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 119cb9d5b0cc3de58c04f0901e68def8f73c2cac..9a01f109052637cb4eb6c7279530f182300819b6 100644 (file)
--- 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 d321a2ac3e495adad8cf28cfa934fff5a6f8f6f8..fcab50d23eaaf03fa4d91f1eb030fe0b3df6603e 100644 (file)
--- 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 5fa9577c13f84f0a5f20c9ed72c1f83433a6c284..7fca1f9a9520b78e9225114602c7ac02ee02b103 100644 (file)
--- 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 b9fedfb97232689ea0c6dc28e6d5f5800edcce10..712837e66665b2bea6dd9795cb6b075c5e7123da 100644 (file)
--- 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 24c86c2fee951cde9ed4b874833d995bd6abbc48..eeabc40ac399b95fa57830a5af5a07cd99832a75 100644 (file)
--- 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 ef2018356116a7909995db9725a35418d1744036..ed0259c124c44832c4e092cfce62ef231f4110cc 100644 (file)
--- 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 535ddbebb5bab0664f2460a114baa4ae2bdd2387..60c373bb02a9a0b0a1131ad8a19fe0c84abffdc9 100644 (file)
--- 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 d8ea15718c447e480a19febc16a23b48979dd096..45fe54fd487cfab914c5afab3294b668efac7075 100644 (file)
--- 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 9254eadb912d97945db35a583d2722f8f2d7762f..5eac9bdaf18e2c6175ca79e853caa02b07dd3045 100644 (file)
--- 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 d3d5587ff1c33ba99a5a7cb422cbb6bd831fda04..f60f1431e2638dff697a13e930e75aaf1787d1c0 100644 (file)
--- 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 bb4cff758cac38ca24cc87c1f2f15ca6d4236da7..d0a2349f8b64110fc7279fadc27021280beef608 100644 (file)
--- 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 c71fbdfe7cfd19a526b361fd2ac719d21af79a2e..c8544707ac9092955e3d03ff7acd5bb9c66446b8 100644 (file)
--- 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 1579fb2bbf17bc0f8fe2ba7e6213a18ece11d85d..474e9a6d480d2d5afdcf96d3e4b3ffda1d7388a2 100644 (file)
--- 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 b12ff84cedc63ccc1e53456de67f5f3668ed59f1..c222503479a013fe8ff1f296f049784371d40da9 100644 (file)
--- 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 010a1c4e8cde92a91800e5fa72460d25d3c3f5f7..6ec8a52757a7b4b1e2ddefd1e1d58788c03c6217 100644 (file)
--- 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 07b29952b1bdb1670b3a7a5c6ed6142b3ca9b291..8c889f4950c2f3be9b07ce0aa910330447618d0a 100644 (file)
--- 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 2e042a1161cccc709bd7827f86c1a653c90d1b0b..874cd397e228aed23eb14ad549ace2a8dd3a7506 100644 (file)
--- 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 f412f632761e8be4d06ec57f90f47b480fff200a..173a66549def88f79ee90720937149587cfc72c9 100644 (file)
--- 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 806a52d6915d421f5b81cc48f0007c3edf6a20d1..679296798a6620a3e35771b09fe5f2085de65940 100644 (file)
--- 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 8816284ddb529f6f8c6bd2926ecd309a40839e43..394e5b580a147b9d935dad7ced722aa375787b01 100644 (file)
--- 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 06b9178378879f2c75fc5d65083f6ef823d4fbdc..6de9899b7c9d0f749dcd3b2df07c7b34c8092736 100644 (file)
--- 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 b465938c8864c9dcef098fdb25bc293c34b77be7..8ac937f957317bbd8bc5b0e4536a91de140b7dd0 100644 (file)
--- 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 b776eb55781ecb3f63eff753fbe0b89d998f639d..709e9fd98eb50d212227688f4e73489a34229191 100644 (file)
--- 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 761d2b733b622fef7579ca32eb496c6af6d8b1ca..10c2a8164c56c6023e1e03bf205bbb45aa847e0c 100644 (file)
--- 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 1f35a5edb9672d8fc723f66082711a08f1c53fca..4d873e6dcb404828f3d02f2cc6ff41cebbf20308 100644 (file)
--- 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 1b219c6ddaf76edd43c4d2d80b6cef38bbb9af49..24ab553bd7c58594db0a71e15338dc8dae039036 100644 (file)
--- 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 9f568f17f9885fe681558b70f89c922aa55dfb0c..a779b636a35526ba21f8b5b41c6e0bd420845b9e 100644 (file)
--- 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 521a9098e420d80c916336a4fd791d38e4d7cd00..a223c54200656cf06cb2febafb5981efff9fd0ae 100644 (file)
--- 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 1b63dc0ab62146b6887b49f989885d3724ad2afb..487a7eda0281d376e58d50e91dc633f79662f389 100644 (file)
--- 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 1762c816345b89ece77a7aac2d5c5c0ddd577f98..1c573655d4d2944304de2863d490292611ddd924 100644 (file)
--- 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 4d818de053c6dfa184f2af4d5b04e0f920b6cb96..3abb57ba77c9e8db3dab0f099099a93fbc7592d7 100644 (file)
--- 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 e4b38d51ec2f8366d9775205c157b9007f0464e9..566bc9705e43ee1ea67d03d578a299ba48c0ad41 100644 (file)
--- 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 cccf363a390d472f2804532411a29b61a034a6bf..4ab2ba40ecadfa2136b6eb33176e775c77bc0f3d 100644 (file)
--- 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 95f1a331455c47d9e7a1f039c19f907781df2295..3668a510a3b6c98bbfed0d982771ae641f93cedc 100644 (file)
--- 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 4d06b4deb816822aa88b56f586df930b404d67a4..6d18b120f8d4234a13bf17ea847a2b1f62583515 100644 (file)
--- 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 a85b4f109bb2f5f435891adc51182ecad5bba3e9..04cfa1a4e8afceb57fea7a152cb9b86c29aeac9f 100644 (file)
--- 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 e5f2ca1ab5e64953eae6b393f930f83b00a225e8..0077d0b24944f102aaf3365bab250aa025222e2e 100644 (file)
--- 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 a71a39461f571ecc3bd6ba034c424bd08cc482b1..252e8e9b62867f88705dcc9e24e5c108bc2571e8 100644 (file)
--- 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 de4a737f9daf42b8fdd9dadf5bfb33edbff9dd70..6e6ae6e0d65633d25d9371ae9ed008bc5ccde48c 100644 (file)
--- 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 0f1ce0c99307ba67379c2e81c60622342a86dcea..662dd6aafb9a2bb726c76dece7ecefe310393ffb 100644 (file)
--- 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 81cee7fafded8c86f16a155a536e857bced32856..df3113b5e9d089521ecce7b055ee55efb4bb2e23 100644 (file)
--- 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