Skip to content
Snippets Groups Projects
Commit 1397e641 authored by Evan Read's avatar Evan Read
Browse files

Merge branch 'russell/move-cyclone-dx-beta-notice' into 'master'

Move beta warning of CycloneDX SBOM feature

See merge request !91636
parents bd8bf24c 0f380bc5
No related branches found
No related tags found
1 merge request!91636Move beta warning of CycloneDX SBOM feature
Pipeline #579040906 passed with warnings
Pipeline: GitLab

#579042251

    ......@@ -839,6 +839,12 @@ Here's an example dependency scanning report:
    > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/350509) in GitLab 14.8 in [Beta](../../../policy/alpha-beta-support.md#beta-features).
    NOTE:
    CycloneDX SBOMs are a [Beta](../../../policy/alpha-beta-support.md#beta-features) feature,
    and the reports are subject to change during the beta period. Do not build integrations
    that rely on the format of these SBOMs staying consistent, as the format might change
    before the feature is made generally available.
    In addition to the [JSON report file](#reports-json-format), the [Gemnasium](https://gitlab.com/gitlab-org/security-products/analyzers/gemnasium)
    Dependency Scanning tool outputs a [CycloneDX](https://cyclonedx.org/) Software Bill of Materials (SBOM) for
    each supported lock or build file it detects. These CycloneDX SBOMs are named
    ......@@ -910,12 +916,6 @@ to store implementation-specific details in the metadata of each CycloneDX SBOM,
    such as the location of build and lock files. If multiple CycloneDX SBOMs are merged together,
    this information is removed from the resulting merged file.
    NOTE:
    CycloneDX SBOMs are a [Beta](../../../policy/alpha-beta-support.md#beta-features) feature,
    and the reports are subject to change during the beta period. Do not build integrations
    that rely on the format of these SBOMs staying consistent, as the format might change
    before the feature is made generally available.
    ## Versioning and release process
    Please check the [Release Process documentation](https://gitlab.com/gitlab-org/security-products/release/blob/master/docs/release_process.md).
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment