Merge "Chore: Turn on SBOM for AAI"

diff --combined jjb/aai/aai-aai-common.yaml
index e52ceb9,a0803d2..2e8eb00
--- 1/jjb/aai/aai-aai-common.yaml
--- 2/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@@ -12,10 -12,10 +12,10 @@@
        - '{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
-           sbom-generator: true
        - '{project-name}-gerrit-release-jobs':
            build-node: centos7-docker-8c-8g
      project: 'aai/aai-common'
@@@ -87,6 -87,7 +87,7 @@@
        - '{project-name}-{stream}-verify-docker'
        - '{project-name}-{stream}-merge-docker'
        - gerrit-maven-docker-stage:
+           sbom-generator: true
            mvn-params: '-P docker -Dmaven.test.skip=true'
            build-node: ubuntu1804-docker-8c-8g
            container-public-registry: 'nexus3.onap.org:10001'

diff --combined jjb/aai/aai-babel.yaml
index e66bf18,d5fe633..2905fdf
--- 1/jjb/aai/aai-babel.yaml
--- 2/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@@ -14,10 -14,11 +14,11 @@@
            cron: '@daily'
        - gerrit-maven-stage:
            sign-artifacts: true
 -          build-node: centos7-builder-4c-4g
 +          build-node: centos8-docker-4c-4g
            maven-versions-plugin: true
            sbom-generator: true
        - gerrit-maven-docker-stage:
+           sbom-generator: true
            mvn-params: '-P docker -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
            build-node: ubuntu1804-docker-8c-8g
            container-public-registry: 'nexus3.onap.org:10001'

diff --combined jjb/aai/aai-graphadmin.yaml
index dfa92c6,7e3aa81..2fd4f28
--- 1/jjb/aai/aai-graphadmin.yaml
--- 2/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@@ -13,10 -13,11 +13,11 @@@
        - '{project-name}-{stream}-merge-java'
        - gerrit-maven-stage:
            sign-artifacts: true
 -          build-node: centos7-builder-4c-4g
 +          build-node: centos8-docker-4c-4g
            maven-versions-plugin: true
            sbom-generator: true
        - gerrit-maven-docker-stage:
+           sbom-generator: true
            mvn-params: '-P docker -Dmaven.test.skip=true'
            build-node: ubuntu1804-docker-8c-8g
            container-public-registry: 'nexus3.onap.org:10001'

diff --combined jjb/aai/aai-graphgraph.yaml
index f3ce092,6af57f9..bac59be
--- 1/jjb/aai/aai-graphgraph.yaml
--- 2/jjb/aai/aai-graphgraph.yaml
+++ b/jjb/aai/aai-graphgraph.yaml
@@@ -13,10 -13,11 +13,11 @@@
        - '{project-name}-{stream}-merge-java'
        - gerrit-maven-stage:
            sign-artifacts: true
 -          build-node: centos7-builder-4c-4g
 +          build-node: centos8-docker-4c-4g
            maven-versions-plugin: true
            sbom-generator: true
        - gerrit-maven-docker-stage:
+           sbom-generator: true
            mvn-params: '-P docker -Dmaven.test.skip=true'
            build-node: ubuntu1804-docker-8c-8g
            container-public-registry: 'nexus3.onap.org:10001'

diff --combined jjb/aai/aai-model-loader.yaml
index d425da5,11edff8..89925a5
--- 1/jjb/aai/aai-model-loader.yaml
--- 2/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@@ -14,10 -14,11 +14,11 @@@
            cron: '@daily'
        - gerrit-maven-stage:
            sign-artifacts: true
 -          build-node: centos7-builder-4c-4g
 +          build-node: centos8-docker-4c-4g
            maven-versions-plugin: true
            sbom-generator: true
        - gerrit-maven-docker-stage:
+           sbom-generator: true
            mvn-params: '-P docker -B -Dmaven.test.skip=true'
            build-node: ubuntu1804-docker-8c-8g
            container-public-registry: 'nexus3.onap.org:10001'

diff --combined jjb/aai/aai-resources.yaml
index aad11fe,f6163f4..474dc7e
--- 1/jjb/aai/aai-resources.yaml
--- 2/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@@ -16,10 -16,11 +16,11 @@@
        - gerrit-maven-stage:
            mvn-params: '-DskipTests'
            sign-artifacts: true
 -          build-node: centos7-builder-4c-4g
 +          build-node: centos8-docker-4c-4g
            maven-versions-plugin: true
            sbom-generator: true
        - gerrit-maven-docker-stage:
+           sbom-generator: true
            mvn-params: '-P docker -Dmaven.test.skip=true'
            build-node: ubuntu1804-docker-8c-8g
            container-public-registry: 'nexus3.onap.org:10001'

diff --combined jjb/aai/aai-schema-service.yaml
index 4f20596,00f89a4..738ecc5
--- 1/jjb/aai/aai-schema-service.yaml
--- 2/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@@ -13,10 -13,11 +13,11 @@@
        - '{project-name}-{stream}-merge-java'
        - gerrit-maven-stage:
            sign-artifacts: true
 -          build-node: centos7-builder-4c-4g
 +          build-node: centos8-docker-4c-4g
            maven-versions-plugin: true
            sbom-generator: true
        - gerrit-maven-docker-stage:
+           sbom-generator: true
            mvn-params: '-P docker -Dmaven.test.skip=true'
            build-node: ubuntu1804-docker-8c-8g
            container-public-registry: 'nexus3.onap.org:10001'

diff --combined jjb/aai/aai-sparky-be.yaml
index 866ff67,9e363c4..6aedc77
--- 1/jjb/aai/aai-sparky-be.yaml
--- 2/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@@ -14,10 -14,11 +14,11 @@@
            cron: '@daily'
        - gerrit-maven-stage:
            sign-artifacts: true
 -          build-node: centos7-builder-4c-4g
 +          build-node: centos8-docker-4c-4g
            maven-versions-plugin: true
            sbom-generator: true
        - gerrit-maven-docker-stage:
+           sbom-generator: true
            mvn-params: '-f sparkybe-onap-application/pom.xml -P docker -B -Dmaven.test.skip=true'
            build-node: ubuntu1804-docker-8c-8g
            container-public-registry: 'nexus3.onap.org:10001'

diff --combined jjb/aai/aai-traversal.yaml
index b8bb13d,ba1e111..68b058d
--- 1/jjb/aai/aai-traversal.yaml
--- 2/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@@ -16,10 -16,11 +16,11 @@@
        - gerrit-maven-stage:
            mvn-params: '-DskipTests'
            sign-artifacts: true
 -          build-node: centos7-builder-4c-4g
 +          build-node: centos8-docker-4c-4g
            maven-versions-plugin: true
            sbom-generator: true
        - gerrit-maven-docker-stage:
+           sbom-generator: true
            mvn-params: '-P docker -Dmaven.test.skip=true'
            build-node: ubuntu1804-docker-8c-8g
            container-public-registry: 'nexus3.onap.org:10001'