Skip to content

Commit c542d1b

Browse files
authored
Merge branch 'master' into docs/Recognized-file-patterns
Signed-off-by: Jan Kowalleck <jan.kowalleck@owasp.org>
2 parents f656072 + 0c9410a commit c542d1b

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ free, open source, and proprietary tools and solutions that support the CycloneD
4747
The following media types are officially registered with IANA:
4848

4949
| Media Type | Format | Assignment |
50-
| ------- | --------- | --------- |
51-
| application/vnd.cyclonedx+xml | XML | [IANA](https://www.iana.org/assignments/media-types/application/vnd.cyclonedx+xml) |
52-
| application/vnd.cyclonedx+json | JSON | [IANA](https://www.iana.org/assignments/media-types/application/vnd.cyclonedx+json) |
50+
|------------|--------|------------|
51+
| `application/vnd.cyclonedx+xml` | XML | [IANA](https://www.iana.org/assignments/media-types/application/vnd.cyclonedx+xml) |
52+
| `application/vnd.cyclonedx+json` | JSON | [IANA](https://www.iana.org/assignments/media-types/application/vnd.cyclonedx+json) |
53+
| `application/x.vnd.cyclonedx+protobuf` | Protocol Buffer | |
5354

5455
Specific versions of CycloneDX can be specified by using the version parameter. For example: `application/vnd.cyclonedx+xml; version=1.6`.
5556

56-
The officially supported media type for Protocol Buffer format is `application/x.vnd.cyclonedx+protobuf`.
5757

5858
## Recognized file patterns
5959

@@ -65,6 +65,7 @@ Alternatively, files that match the glob pattern below are also recognized:
6565
* `*.cdx.json` for JSON encoded CycloneDX BOM files.
6666
* `*.cdx.xml` for XML encoded CycloneDX BOM files.
6767

68+
6869
## Release History
6970

7071
| Version | Release Date |

0 commit comments

Comments
 (0)