Merge "Chore: Turn on SBOM for MSB"

[ci-management.git] / jjb / ccsdk / features.yaml

diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 4a2ba1d..60d6f67 100644 (file)
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -9,23 +9,24 @@
           cron: '@daily'
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-stage:
-          build-node: centos8-builder-4c-4g
+          build-node: centos8-docker-8c-8g
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
-          sbom-generator: false
+          sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos8-docker-8c-8g
+          build-node: centos7-docker-2c-8g
 
     project: 'ccsdk/features'
     stream:
       - 'master':
           branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
+          java-version: openjdk17
+          mvn-opts: '-Xmx3072m'
       - 'kohn':
           branch: 'kohn'
-    java-version: openjdk17
+          java-version: openjdk11
+          mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-features-settings'
     # due to a strange macro / variable translation problem this needs to be
@@ -35,7 +36,6 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
     build-node: centos8-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -57,7 +57,7 @@
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-features-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
+    mvn-opts: '-Xmx3072m'
 
 - project:
     name: ccsdk-features-clm
@@ -72,7 +72,7 @@
     java-version: openjdk17
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-features-settings'
-    mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
+    mvn-opts: '-Xmx3072m --add-opens=java.base/java.util=ALL-UNNAMED'
     build-node: centos8-builder-4c-4g
 
 - project: