Update CCSDK and SDNC to use JDK 17 compiler

[ci-management.git] / jjb / sdnc / sdnc-apps.yaml

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 29ef94c..b92ed48 100644 (file)
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -22,6 +22,7 @@
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
+          sbom-generator: false
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
@@ -36,12 +37,12 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-      - 'honolulu':
-          branch: 'honolulu'
-    java-version: openjdk11
-    mvn-version : "mvn36"
+      - 'jakarta':
+          branch: 'jakarta'
+      - 'kohn':
+          branch: 'kohn'
+    java-version: openjdk17
+    mvn-version : "mvn38"
     mvn-settings: 'sdnc-apps-settings'
 
     # due to a strange macro / variable translation problem this needs to be
@@ -51,7 +52,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    maven-version: "mvn36"
+    maven-version: "mvn38"
     build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
@@ -62,7 +63,6 @@
       - 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'
@@ -70,12 +70,12 @@
     project: 'sdnc/apps'
     project-name: 'sdnc-apps'
     branch: 'master'
-    java-version: openjdk11
-    mvn-version : "mvn36"
+    java-version: openjdk17
+    mvn-version : "mvn38"
     mvn-settings: 'sdnc-apps-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: "mvn36"
+    maven-version: "mvn38"
 
 #
 #- project:
@@ -106,8 +106,8 @@
     stream:
       - 'master':
           branch: 'master'
-    java-version: openjdk11
-    mvn-version : "mvn36"
+    java-version: openjdk17
+    mvn-version : "mvn38"
     mvn-settings: 'sdnc-apps-settings'
 
 - project: