Merge branch 'otovar/add-support-for-cyclonedx-1.6-reports' into 'master'

Support CycloneDX 1.6 reports

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/163562



Merged-by: Brian Williams <bwilliams@gitlab.com>
Approved-by: Brian Williams <bwilliams@gitlab.com>
Reviewed-by: Brian Williams <bwilliams@gitlab.com>
Co-authored-by: Oscar Tovar <otovar@gitlab.com>

lib/gitlab/ci/parsers/sbom/validators/cyclonedx_schema_validator.rb

@@ -6,7 +6,7 @@ module Parsers
       module Sbom
         module Validators
           class CyclonedxSchemaValidator
-            SUPPORTED_SPEC_VERSIONS = %w[1.4 1.5].freeze
+            SUPPORTED_SPEC_VERSIONS = %w[1.4 1.5 1.6].freeze
 
             SCHEMA_BASE_PATH = Rails.root.join('app', 'validators', 'json_schemas', 'cyclonedx').freeze
 

spec/lib/gitlab/ci/parsers/sbom/validators/cyclonedx_schema_validator_spec.rb

@@ -219,7 +219,7 @@
   end
 
   context 'when spec version is supported' do
-    where(:spec_version) { %w[1.4 1.5] }
+    where(:spec_version) { %w[1.4 1.5 1.6] }
 
     with_them do
       it_behaves_like 'a validator that performs the expected validations'