X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fso%2Fso-libs.yaml;h=2f5c9b0a19929b654c702bfc12a7e22040db63a5;hb=567561ce873702d23f00fdb96c423b684a5d32ec;hp=af1be777c284ce5a639acbbe84b8e4816724d7ae;hpb=5fe0aca4a1bbed3e833547d457de6d0c81df0b41;p=ci-management.git

diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index af1be777c..2f5c9b0a1 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -6,8 +6,9 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
+          sbom-generator: true
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
@@ -15,8 +16,7 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
+          java-version: openjdk11
     mvn-settings: 'so-libs-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined
@@ -28,17 +28,18 @@
 
 - project:
     name: so-libs-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
     build-node: ubuntu1804-builder-4c-4g
     project: 'so/libs'
     project-name: 'so-libs'
+    java-version: openjdk11
     branch: 'master'
     mvn-settings: 'so-libs-settings'
     mvn-goals: 'clean install'
@@ -46,20 +47,22 @@
 
 - project:
     name: so-libs-clm
+    java-version: openjdk11
     jobs:
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: so/libs
     project-name: 'so-libs'
+    java-version: openjdk11
     branch: 'master'
     mvn-settings: 'so-libs-settings'
 
 - project:
     name: so-libs-info
     project-name: so-libs
+    java-version: openjdk11
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: so/libs
     branch: master
-    branch: elalto