Use maven-3.8 for Sonar jobs

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

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index 50ba04b5c607ed9a1f835c03230a20221a8137c7..2c0c4cb3e1ea78cc8fdd0b461caf9996f768a2c6 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -1,9 +1,10 @@
 ---
 - project:
-    name: serviceutils-phosphorus
+    name: serviceutils-sulfur
     jobs:
       - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: serviceutils
@@ -11,13 +12,14 @@
           rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
+      - odl-maven-verify-jobs-jdk17
 
     branch: "master"
-    stream: phosphorus
+    stream: sulfur
 
     project: "serviceutils"
     project-name: "serviceutils"
-    build-node: centos7-builder-2c-2g
+    build-node: centos8-builder-2c-2g
     java-version: "openjdk11"
     mvn-settings: "serviceutils-settings"
     mvn-opts: "-Xmx1024m"
@@ -32,7 +34,7 @@
     staging-profile-id: 12cc4ba8bf01ba
 
 - project:
-    name: serviceutils-silicon
+    name: serviceutils-phosphorus
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -44,8 +46,8 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    branch: "stable/silicon"
-    stream: silicon
+    branch: "stable/phosphorus"
+    stream: phosphorus
 
     project: "serviceutils"
     project-name: "serviceutils"
@@ -64,7 +66,7 @@
     staging-profile-id: 12cc4ba8bf01ba
 
 - project:
-    name: serviceutils-aluminium
+    name: serviceutils-silicon
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -76,8 +78,8 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    branch: "stable/aluminium"
-    stream: aluminium
+    branch: "stable/silicon"
+    stream: silicon
 
     project: "serviceutils"
     project-name: "serviceutils"
@@ -105,6 +107,7 @@
     branch: "master"
     build-node: centos7-builder-4c-4g
     java-version: "openjdk11"
+    mvn-version: mvn38
     mvn-settings: "serviceutils-settings"
     mvn-opts: "-Xmx1024m"
     sonarcloud: true