Merge "Chore: Turn on SBOM for AAI"

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

diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 844178d..eedabbe 100644 (file)
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -15,7 +15,7 @@
           cron: ''
           sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos8-docker-8c-8g
+          build-node: centos7-docker-2c-8g
 
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -23,6 +23,7 @@
     stream:
       - 'master':
           branch: 'master'
+          java-version: openjdk17
           jobs:
             - gerrit-maven-verify:
                 mvn-params: '-Drevision=3.0.0-SNAPSHOT'
@@ -32,11 +33,9 @@
                 mvn-params: '-Dmaven.test.skip=true -Drevision=3.0.0'
             - '{project-name}-gerrit-release-jobs':
                 mvn-params: '-Drevision=3.0.0'
-      - 'jakarta':
-          branch: 'jakarta'
       - 'kohn':
           branch: 'kohn'
-    java-version: openjdk17
+          java-version: openjdk11
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-parent-settings'
     # due to a strange macro / variable translation problem this needs to be
@@ -60,6 +59,7 @@
     java-version: openjdk17
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-parent-settings'
+    mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED'
     build-node: centos8-builder-4c-4g
 
 - project: