GITBOOK-6815: MERGE: CLI: Help, SBOM commands, add SBOM format Cyclon…

…eDX 1.5

docs/snyk-cli/commands/container-sbom.md

@@ -10,13 +10,13 @@ The `snyk container sbom` feature requires an internet connection.
 
 ## Usage
 
-`$ snyk container sbom --format=<cyclonedx1.4+json|cyclonedx1.4+xml|spdx2.3+json> [--org=<ORG_ID>] [--exclude-app-vulns] <IMAGE>`
+`$ snyk container sbom --format=<cyclonedx1.4+json|cyclonedx1.4+xml|cyclonedx1.5+json|cyclonedx1.5+xml|spdx2.3+json> [--org=<ORG_ID>] [--exclude-app-vulns] <IMAGE>`
 
 ## Description
 
 The `snyk container sbom` command generates an SBOM for a container image.
 
-Supported formats include CycloneDX v1.4 (JSON or XML) and SPDX v2.3 (JSON).
+Supported formats include CycloneDX v1.4 (JSON or XML), CycloneDX v1.5 (JSON or XML) and SPDX v2.3 (JSON).
 
 An SBOM can be generated for operating system dependencies as well as application dependencies within the image. Unmanaged dependencies are currently not supported.
 
@@ -33,11 +33,11 @@ Use the `-d` or `--debug` option to output the debug logs.
 
 ## Options
 
-### `--format=<cyclonedx1.4+json|cyclonedx1.4+xml|spdx2.3+json>`
+### `--format=<cyclonedx1.4+json|cyclonedx1.4+xml|cyclonedx1.5+json|cyclonedx1.5+xml|spdx2.3+json>`
 
 Required. Specify the output format for the SBOM to be produced.
 
-Set the desired SBOM output format. Available options are `cyclonedx1.4+json`, `cyclonedx1.4+xml`, and `spdx2.3+json`
+Set the desired SBOM output format. Available options are `cyclonedx1.4+json`, `cyclonedx1.4+xml`, `cyclonedx1.5+json`, `cyclonedx1.5+xml` and `spdx2.3+json`
 
 ### `[--org=<ORG_ID>]`
 
@@ -77,16 +77,16 @@ Required. The image for which you will generate an SBOM document.
 
 ### Create a CycloneDX JSON document for an image
 
-`$ snyk container sbom --format=cyclonedx1.4+json redis:latest`
+`$ snyk container sbom --format=cyclonedx1.5+json redis:latest`
 
 ### Create a CycloneDX JSON document for an image and redirect stdout to a file
 
-`$ snyk container sbom --format=cyclonedx1.4+json redis:latest > mySBOM.json`
+`$ snyk container sbom --format=cyclonedx1.5+json redis:latest > mySBOM.json`
 
 ### Create a SPDX JSON document for an image while excluding application dependencies
 
 `$ snyk container sbom --format=spdx2.3+json redis:latest --exclude-app-vulns`
 
 ### Refer to a container image by its digest
 
-`$ snyk container sbom --format=cyclonedx1.4+xml alpine@sha256:c5c5fda71656f28e49ac9c5416b3643eaa6a108a8093151d6d1afc9463be8e33`
+`$ snyk container sbom --format=cyclonedx1.5+xml alpine@sha256:c5c5fda71656f28e49ac9c5416b3643eaa6a108a8093151d6d1afc9463be8e33`

docs/snyk-cli/commands/sbom.md

@@ -10,13 +10,13 @@ The `snyk sbom` feature requires an internet connection.
 
 ## Usage
 
-`$ snyk sbom --format=<cyclonedx1.4+json|cyclonedx1.4+xml|spdx2.3+json> [--file=<FILE>] [--unmanaged] [--org=<ORG_ID>] [--dev] [--all-projects] [--name=<NAME>] [--version=<VERSION>] [--exclude=<NAME>[,<NAME>...]] [--detection-depth=<DEPTH>] [--prune-repeated-subdependencies|-p] [--maven-aggregate-project] [--scan-unmanaged] [--scan-all-unmanaged] [--sub-project=<NAME>] [--gradle-sub-project=<NAME>] [--all-sub-projects] [--configuration-matching=<CONFIGURATION_REGEX>] [--configuration-attributes=<ATTRIBUTE>[,<ATTRIBUTE>]] [--init-script=<FILE>] [--json-file-output=<OUTPUT_FILE_PATH>] [<TARGET_DIRECTORY>]`
+`$ snyk sbom --format=<cyclonedx1.4+json|cyclonedx1.4+xml|cyclonedx1.5+json|cyclonedx1.5+xml|spdx2.3+json> [--file=<FILE>] [--unmanaged] [--org=<ORG_ID>] [--dev] [--all-projects] [--name=<NAME>] [--version=<VERSION>] [--exclude=<NAME>[,<NAME>...]] [--detection-depth=<DEPTH>] [--prune-repeated-subdependencies|-p] [--maven-aggregate-project] [--scan-unmanaged] [--scan-all-unmanaged] [--sub-project=<NAME>] [--gradle-sub-project=<NAME>] [--all-sub-projects] [--configuration-matching=<CONFIGURATION_REGEX>] [--configuration-attributes=<ATTRIBUTE>[,<ATTRIBUTE>]] [--init-script=<FILE>] [--json-file-output=<OUTPUT_FILE_PATH>] [<TARGET_DIRECTORY>]`
 
 ## Description
 
 The `snyk sbom` command generates an SBOM for a local software project in an ecosystem supported by Snyk.
 
-Supported formats include CycloneDX v1.4 (JSON or XML) and SPDX v2.3 (JSON).
+Supported formats include CycloneDX v1.4 (JSON or XML), CycloneDX v1.5 (JSON or XML) and SPDX v2.3 (JSON).
 
 An SBOM can be generated for all supported Open Source package managers as well as unmanaged software projects.
 
@@ -33,11 +33,11 @@ Use the `-d` or `--debug` option to output the debug logs.
 
 ## Options
 
-### `--format=<cyclonedx1.4+json|cyclonedx1.4+xml|spdx2.3+json>`
+### `--format=<cyclonedx1.4+json|cyclonedx1.4+xml|cyclonedx1.5+json|cyclonedx1.5+xml|spdx2.3+json>`
 
 Required. Specify the output format for the SBOM to be produced.
 
-Set the desired SBOM output format. Available options are `cyclonedx1.4+json`, `cyclonedx1.4+xml`, and `spdx2.3+json`
+Set the desired SBOM output format. Available options are `cyclonedx1.4+json`, `cyclonedx1.4+xml`, `cyclonedx1.5+json`, `cyclonedx1.5+xml` and `spdx2.3+json`
 
 ### `[--org=<ORG_ID>]`
 
@@ -288,11 +288,11 @@ Example: `snyk sbom -- -s settings.xml`
 
 ### Create a CycloneDX JSON document for a local software project
 
-`$ snyk sbom --format=cyclonedx1.4+json`
+`$ snyk sbom --format=cyclonedx1.5+json`
 
 ### Create a CycloneDX JSON document and redirect stdout to a file
 
-`$ snyk sbom --format=cyclonedx1.4+json > mySBOM.json`
+`$ snyk sbom --format=cyclonedx1.5+json > mySBOM.json`
 
 ### Create an SPDX JSON document and write it to a file
 
@@ -304,8 +304,8 @@ Example: `snyk sbom -- -s settings.xml`
 
 ### Create a CycloneDX XML document for a Maven project
 
-`$ snyk sbom --file=pom.xml --format=cyclonedx1.4+xml`
+`$ snyk sbom --file=pom.xml --format=cyclonedx1.5+xml`
 
 ### Create a CycloneDX JSON document for a monorepo
 
-`$ snyk sbom --format=cyclonedx1.4+json --all-projects`
+`$ snyk sbom --format=cyclonedx1.5+json --all-projects`