Merge "Chore: Turn on SBOM for VFC"

diff --cc jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index 4fc3df1,86eb6f4..827e072
--- 1/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
--- 2/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@@ -21,8 -21,9 +21,9 @@@
        - '{project-name}-{stream}-{subproject}-verify-java'
        - '{project-name}-{stream}-{subproject}-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}-{stream}-docker-java-version-shell-daily':
            docker-pom: 'pom.xml'

diff --cc jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index 5df66c4,56045f6..9044300
--- 1/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
--- 2/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@@ -15,8 -15,9 +15,9 @@@
        - '{project-name}-{stream}-{subproject}-verify-java'
        - '{project-name}-{stream}-{subproject}-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}-{stream}-docker-java-version-shell-daily':
            docker-pom: 'pom.xml'

diff --cc jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index 54509ea,116966f..4773938
--- 1/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
--- 2/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@@ -16,8 -16,9 +16,9 @@@
        - '{project-name}-{stream}-{subproject}-verify-java'
        - '{project-name}-{stream}-{subproject}-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}-{stream}-docker-java-version-shell-daily':
            docker-pom: 'pom.xml'

diff --cc jjb/vfc/vfc-nfvo-db.yaml
index 258ae31,1c7781c..c9c9b4c
--- 1/jjb/vfc/vfc-nfvo-db.yaml
--- 2/jjb/vfc/vfc-nfvo-db.yaml
+++ b/jjb/vfc/vfc-nfvo-db.yaml
@@@ -12,8 -12,9 +12,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}-{stream}-docker-java-version-shell-daily':
            docker-pom: 'pom.xml'

diff --cc jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
index 5d975c4,789c149..8a6505b
--- 1/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
--- 2/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
@@@ -16,8 -16,9 +16,9 @@@
        - '{project-name}-{stream}-{subproject}-verify-java'
        - '{project-name}-{stream}-{subproject}-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
            mvn-pom: 'huawei/pom.xml'
            mvn-params: '-f huawei/pom.xml'

diff --cc jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index e779697,2ecbde1..ea4177a
--- 1/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
--- 2/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@@ -16,8 -16,9 +16,9 @@@
        - '{project-name}-{stream}-{subproject}-verify-java'
        - '{project-name}-{stream}-{subproject}-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
            mvn-pom: 'gvnfmadapter/pom.xml'
            mvn-params: '-f gvnfmadapter/pom.xml'

diff --cc jjb/vfc/vfc-nfvo-lcm-java.yaml
index 24f98c1,d659608..425d489
--- 1/jjb/vfc/vfc-nfvo-lcm-java.yaml
--- 2/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@@ -11,8 -11,9 +11,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}-{stream}-docker-java-version-shell-daily':
            docker-pom: 'pom.xml'