Set JDK11 for transportpce magnesium build jobs

[releng/builder.git] / jjb / p4plugin / p4plugin.yaml

diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml
index 1762c816345b89ece77a7aac2d5c5c0ddd577f98..13a0d1b5b59b4c1439dbf006576f443042a5f9ed 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,26 +50,7 @@
     project-name: 'p4plugin'
     branch: 'stable/neon'
     mvn-settings: 'p4plugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[p4plugin]'
-
-    # Used by the release job
-    staging-profile-id: a68bf26e208d4
-
-- project:
-    name: p4plugin-fluorine
-    jobs:
-      - '{project-name}-maven-javadoc-jobs'
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: fluorine
-    project: 'p4plugin'
-    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 +66,7 @@
     project-name: 'p4plugin'
     branch: 'master'
     mvn-settings: 'p4plugin-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
 - project:
     name: p4plugin-view