Revert "Revert "Feat!: Update JJB version to 6x""

[releng/builder.git] / jjb / releng-maven-mri-stage.yaml

diff --git a/jjb/releng-maven-mri-stage.yaml b/jjb/releng-maven-mri-stage.yaml
index cd957c047de9078bc0608364f47fbb1b73e901e8..de308d76345e7a85dc9c8f95de1640c240f38963 100644 (file)
--- a/jjb/releng-maven-mri-stage.yaml
+++ b/jjb/releng-maven-mri-stage.yaml
@@ -1,8 +1,9 @@
+---
 ####################
 # COMMON FUNCTIONS #
 ####################
 
-- releng_maven_mri_common: &releng_maven_mri_common
+- _releng_maven_mri_common: &releng_maven_mri_common
     name: releng-maven-mri-common
 
     ######################
@@ -71,7 +72,7 @@
 # Maven Stage #
 ###############
 
-- releng_maven_mri_stage: &releng_maven_mri_stage
+- _releng_maven_mri_stage: &releng_maven_mri_stage
     name: releng-maven-mri-stage
 
     ######################
@@ -85,7 +86,7 @@
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
     github-url: "https://github.com"
-    java-version: openjdk8
+    java-version: openjdk17
     maven-versions-plugin: false
     version-properties-file: version.properties
     mvn-central: false
@@ -96,6 +97,10 @@
     mvn-version: mvn35
     ossrh-profile-id: ""
     mvn-pom: ""
+    sbom-flags: ""
+    sbom-path: "$WORKSPACE"
+    sbom-generator: false
+    sbom-generator-version: "v0.0.15"
     sign-artifacts: false
     sign-mode: serial
     stream: master
@@ -131,6 +136,8 @@
           mvn-params: "{mvn-params}"
           mvn-version: "{mvn-version}"
           staging-profile-id: "{staging-profile-id}"
+      - distribution-karaf-version:
+          karaf-version: "{karaf-version}"
       - bool:
           name: MAVEN_VERSIONS_PLUGIN
           default: "{maven-versions-plugin}"
@@ -143,6 +150,14 @@
           name: STAGING_PROFILE_ID
           default: "{staging-profile-id}"
           description: Nexus staging profile ID.
+      - string:
+          name: SBOM_GENERATOR_VERSION
+          default: "{sbom-generator-version}"
+          description: SBOM generator version to download and run.
+      - string:
+          name: SBOM_PATH
+          default: "{sbom-path}"
+          description: path where SBOM needs to be executed.
 
     builders:
       - lf-infra-pre-build
@@ -164,6 +179,14 @@
       - shell: !include-raw-escape: global-jjb/shell/maven-patch-release.sh
       - lf-maven-build:
           mvn-goals: "{mvn-goals}"
+      # With SBOM Generator
+      - conditional-step:
+          condition-kind: boolean-expression
+          condition-expression: "{sbom-generator}"
+          steps:
+            - shell: echo 'Running SBOM Generator'
+            - lf-infra-maven-sbom-generator:
+                sbom-flags: "{sbom-flags}"
       - lf-sigul-sign-dir:
           sign-artifacts: "{sign-artifacts}"
           sign-dir: "$WORKSPACE/m2repo"