Merge "Move unimgr Sonar scan to Sonarcloud"

[releng/builder.git] / jjb / integration / distribution / distribution-jobs.yaml

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index d6278459213f99b7761463adab15439ca4c18458..36dd6ba9bf6374aed929e787b5d19133340397db 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -23,10 +23,12 @@
     stream:
       - aluminium:
           branch: 'master'
+          java-version: openjdk11
           jre: 'openjdk11'
           karaf-version: odl
       - magnesium:
           branch: 'stable/magnesium'
+          java-version: openjdk11
           jre: 'openjdk11'
           karaf-version: odl
       - sodium:
@@ -69,10 +71,8 @@
           dependencies: >
               aaa-maven-merge-{stream},
               bgpcep-maven-merge-{stream},
-              controller-maven-merge-{stream},
               daexim-maven-merge-{stream},
               genius-maven-merge-{stream},
-              infrautils-maven-merge-{stream},
               jsonrpc-maven-merge-{stream},
               lispflowmapping-maven-merge-{stream},
               netconf-maven-merge-{stream},