Set JDK11 for all magnesium build jobs

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

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 712837e66665b2bea6dd9795cb6b075c5e7123da..f63e557dd8280cd7cdab26ae46264a90a52fe1b3 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -8,13 +8,14 @@
           project-pattern: daexim
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
           rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     project: 'daexim'
     project-name: 'daexim'
     stream: magnesium
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'daexim-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -71,30 +72,6 @@
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
 
-- project:
-    name: daexim-fluorine
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
-          project-pattern: daexim
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
-          rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    project: 'daexim'
-    project-name: 'daexim'
-    stream: fluorine
-    branch: 'stable/fluorine'
-    mvn-settings: 'daexim-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
-    email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
-
-    # Used by the release job
-    staging-profile-id: 96e4dade34bd7
-
 - project:
     name: daexim-sonar
     jobs:
@@ -103,6 +80,7 @@
     project: 'daexim'
     project-name: 'daexim'
     branch: 'master'
+    java-version: 'openjdk11'
     mvn-settings: 'daexim-settings'
     mvn-opts: '-Xmx1024m'