Merge "Chore: Turn on SBOM for SO"

diff --cc jjb/so/so-adapters-so-cnf-adapter.yaml
index 456cd9b,916e377..84ace63
--- 1/jjb/so/so-adapters-so-cnf-adapter.yaml
--- 2/jjb/so/so-adapters-so-cnf-adapter.yaml
+++ b/jjb/so/so-adapters-so-cnf-adapter.yaml
@@@ -20,10 -20,12 +20,12 @@@
        - '{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
        - gerrit-maven-docker-stage:
+           sbom-generator: true
            build-node: ubuntu1804-docker-v1-8c-8g
            maven-versions-plugin: true
            mvn-params: '-P docker -DskipTests'

diff --cc jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
index f1578f2,7a75fca..37ffeac
--- 1/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
--- 2/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
+++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml
@@@ -20,10 -20,12 +20,12 @@@
        - '{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
        - gerrit-maven-docker-stage:
+           sbom-generator: true
            build-node: ubuntu1804-docker-v1-8c-8g
            maven-versions-plugin: true
            mvn-params: '-P docker -DskipTests'

diff --cc jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
index f90c894,261a2e2..db9f91d
--- 1/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
--- 2/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
+++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
@@@ -20,10 -20,12 +20,12 @@@
        - '{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
        - gerrit-maven-docker-stage:
+           sbom-generator: true
            build-node: ubuntu1804-docker-v1-8c-8g
            maven-versions-plugin: true
            mvn-params: '-P docker -DskipTests'

diff --cc jjb/so/so-adapters-so-nssmf-adapter.yaml
index 6e51b8b,c4c2dc5..7a45cd9
--- 1/jjb/so/so-adapters-so-nssmf-adapter.yaml
--- 2/jjb/so/so-adapters-so-nssmf-adapter.yaml
+++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml
@@@ -20,10 -20,12 +20,12 @@@
        - '{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
        - gerrit-maven-docker-stage:
+           sbom-generator: true
            build-node: ubuntu1804-docker-v1-8c-8g
            maven-versions-plugin: true
            mvn-params: '-P docker -DskipTests'

diff --cc jjb/so/so-adapters-so-oof-adapter.yaml
index c59c8ba,4e342f4..2f5ba19
--- 1/jjb/so/so-adapters-so-oof-adapter.yaml
--- 2/jjb/so/so-adapters-so-oof-adapter.yaml
+++ b/jjb/so/so-adapters-so-oof-adapter.yaml
@@@ -20,10 -20,12 +20,12 @@@
        - '{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
        - gerrit-maven-docker-stage:
+           sbom-generator: true
            build-node: ubuntu1804-docker-v1-8c-8g
            maven-versions-plugin: true
            mvn-params: '-P docker -DskipTests'

diff --cc jjb/so/so-libs.yaml
index c6f2e8a,da5130a..2f5c9b0
--- 1/jjb/so/so-libs.yaml
--- 2/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@@ -6,8 -6,9 +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

diff --cc jjb/so/so-so-admin-cockpit.yaml
index 810b739,8067ca4..f33d945
--- 1/jjb/so/so-so-admin-cockpit.yaml
--- 2/jjb/so/so-so-admin-cockpit.yaml
+++ b/jjb/so/so-so-admin-cockpit.yaml
@@@ -20,10 -20,12 +20,12 @@@
        - '{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
        - gerrit-maven-docker-stage:
+           sbom-generator: true
            build-node: ubuntu1804-docker-v1-8c-8g
            maven-versions-plugin: true
            mvn-params: '-P docker -DskipTests'

diff --cc jjb/so/so-so-etsi-nfvo.yaml
index 40796c8,ee1cd22..1ce164f
--- 1/jjb/so/so-so-etsi-nfvo.yaml
--- 2/jjb/so/so-so-etsi-nfvo.yaml
+++ b/jjb/so/so-so-etsi-nfvo.yaml
@@@ -20,10 -20,12 +20,12 @@@
        - '{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
        - gerrit-maven-docker-stage:
+           sbom-generator: true
            build-node: ubuntu1804-docker-v1-8c-8g
            maven-versions-plugin: true
            mvn-params: '-P docker -DskipTests'

diff --cc jjb/so/so.yaml
index 7f3c1aa,6d9e6cb..3ded1b5
--- 1/jjb/so/so.yaml
--- 2/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@@ -13,10 -13,12 +13,12 @@@
        - '{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
        - gerrit-maven-docker-stage:
+           sbom-generator: true
            build-node: ubuntu1804-docker-v1-8c-8g
            maven-versions-plugin: true
            mvn-params: '-P docker -DskipTests'