Skip to content

Commit 55596b2

Browse files
jkowalleckjkowalleck
authored
Merge branch 'master' into ci/tets_use_bufbuild-buf1.58.0
Signed-off-by: Jan Kowalleck <[email protected]>
2 parents 743f35f + 4b3f594 commit 55596b2

File tree

273 files changed

+40358
-17
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

273 files changed

+40358
-17
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ Alternatively, files that match the glob pattern below are also recognized:
7777

7878
| Version | Release Date |
7979
|-------------------|-----------------|
80+
| CycloneDX 1.7 | 21 October 2025 |
8081
| CycloneDX 1.6 | 09 April 2024 |
8182
| CycloneDX 1.5 | 26 June 2023 |
8283
| CycloneDX 1.4 | 12 January 2022 |

‎docgen/json/gen.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
set -eu
33

44
declare -a CDX_VERSIONS=(
5+
'1.7'
56
'1.6'
67
'1.5'
78
'1.4'

‎docgen/json/templates/cyclonedx/base.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,14 @@
4040
v${version} (JSON)
4141
</a>
4242
<ul class="dropdown-menu" aria-labelledby="navbarScrollingDropdown">
43+
<li><a class="dropdown-item" href="/docs/1.7/json/">v1.7 (JSON)</a></li>
4344
<li><a class="dropdown-item" href="/docs/1.6/json/">v1.6 (JSON)</a></li>
4445
<li><a class="dropdown-item" href="/docs/1.5/json/">v1.5 (JSON)</a></li>
4546
<li><a class="dropdown-item" href="/docs/1.4/json/">v1.4 (JSON)</a></li>
4647
<li><a class="dropdown-item" href="/docs/1.3/json/">v1.3 (JSON)</a></li>
4748
<li><a class="dropdown-item" href="/docs/1.2/json/">v1.2 (JSON)</a></li>
4849
<li><hr class="dropdown-divider"/></li>
50+
<li><a class="dropdown-item" href="/docs/1.7/xml/">v1.7 (XML)</a></li>
4951
<li><a class="dropdown-item" href="/docs/1.6/xml/">v1.6 (XML)</a></li>
5052
<li><a class="dropdown-item" href="/docs/1.5/xml/">v1.5 (XML)</a></li>
5153
<li><a class="dropdown-item" href="/docs/1.4/xml/">v1.4 (XML)</a></li>
@@ -54,6 +56,7 @@
5456
<li><a class="dropdown-item" href="/docs/1.1/xml/">v1.1 (XML)</a></li>
5557
<li><a class="dropdown-item" href="/docs/1.0/xml/">v1.0 (XML)</a></li>
5658
<li><hr class="dropdown-divider"/></li>
59+
<li><a class="dropdown-item" href="/docs/1.7/proto/">v1.7 (Protobuf)</a></li>
5760
<li><a class="dropdown-item" href="/docs/1.6/proto/">v1.6 (Protobuf)</a></li>
5861
<li><a class="dropdown-item" href="/docs/1.5/proto/">v1.5 (Protobuf)</a></li>
5962
<li><a class="dropdown-item" href="/docs/1.4/proto/">v1.4 (Protobuf)</a></li>

‎docgen/proto/gen.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
set -eu
33

44
declare -a CDX_VERSIONS=(
5+
'1.7'
56
'1.6'
67
'1.5'
78
'1.4'

‎docgen/proto/templates/html.tmpl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,12 +271,14 @@ https://github.com/pseudomuto/protoc-gen-doc/blob/master/resources/html.tmpl
271271
v${version} (Protobuf)
272272
</a>
273273
<ul class="dropdown-menu" aria-labelledby="navbarScrollingDropdown">
274+
<li><a class="dropdown-item" href="/docs/1.7/json/">v1.7 (JSON)</a></li>
274275
<li><a class="dropdown-item" href="/docs/1.6/json/">v1.6 (JSON)</a></li>
275276
<li><a class="dropdown-item" href="/docs/1.5/json/">v1.5 (JSON)</a></li>
276277
<li><a class="dropdown-item" href="/docs/1.4/json/">v1.4 (JSON)</a></li>
277278
<li><a class="dropdown-item" href="/docs/1.3/json/">v1.3 (JSON)</a></li>
278279
<li><a class="dropdown-item" href="/docs/1.2/json/">v1.2 (JSON)</a></li>
279280
<li><hr class="dropdown-divider"/></li>
281+
<li><a class="dropdown-item" href="/docs/1.7/xml/">v1.7 (XML)</a></li>
280282
<li><a class="dropdown-item" href="/docs/1.6/xml/">v1.6 (XML)</a></li>
281283
<li><a class="dropdown-item" href="/docs/1.5/xml/">v1.5 (XML)</a></li>
282284
<li><a class="dropdown-item" href="/docs/1.4/xml/">v1.4 (XML)</a></li>
@@ -285,6 +287,7 @@ https://github.com/pseudomuto/protoc-gen-doc/blob/master/resources/html.tmpl
285287
<li><a class="dropdown-item" href="/docs/1.1/xml/">v1.1 (XML)</a></li>
286288
<li><a class="dropdown-item" href="/docs/1.0/xml/">v1.0 (XML)</a></li>
287289
<li><hr class="dropdown-divider"/></li>
290+
<li><a class="dropdown-item" href="/docs/1.7/proto/">v1.7 (Protobuf)</a></li>
288291
<li><a class="dropdown-item" href="/docs/1.6/proto/">v1.6 (Protobuf)</a></li>
289292
<li><a class="dropdown-item" href="/docs/1.5/proto/">v1.5 (Protobuf)</a></li>
290293
<li><a class="dropdown-item" href="/docs/1.4/proto/">v1.4 (Protobuf)</a></li>

‎docgen/xml/gen.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
set -eu
33

44
declare -a CDX_VERSIONS=(
5+
'1.7'
56
'1.6'
67
'1.5'
78
'1.4'

‎docgen/xml/xs3p.xsl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,12 +340,14 @@
340340
<li class="dropdown">
341341
<a href="#" class="dropdown-toggle version-selector" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">v<xsl:value-of select="$cycloneDxVersion"/> (XML)<span class="caret"></span></a>
342342
<ul class="dropdown-menu">
343+
<li><a class="dropdown-item" href="/docs/1.7/json/">v1.7 (JSON)</a></li>
343344
<li><a class="dropdown-item" href="/docs/1.6/json/">v1.6 (JSON)</a></li>
344345
<li><a class="dropdown-item" href="/docs/1.5/json/">v1.5 (JSON)</a></li>
345346
<li><a class="dropdown-item" href="/docs/1.4/json/">v1.4 (JSON)</a></li>
346347
<li><a class="dropdown-item" href="/docs/1.3/json/">v1.3 (JSON)</a></li>
347348
<li><a class="dropdown-item" href="/docs/1.2/json/">v1.2 (JSON)</a></li>
348349
<li style="padding:0"><hr class="dropdown-divider"/></li>
350+
<li><a class="dropdown-item" href="/docs/1.7/xml/">v1.7 (XML)</a></li>
349351
<li><a class="dropdown-item" href="/docs/1.6/xml/">v1.6 (XML)</a></li>
350352
<li><a class="dropdown-item" href="/docs/1.5/xml/">v1.5 (XML)</a></li>
351353
<li><a class="dropdown-item" href="/docs/1.4/xml/">v1.4 (XML)</a></li>
@@ -354,6 +356,7 @@
354356
<li><a class="dropdown-item" href="/docs/1.1/xml/">v1.1 (XML)</a></li>
355357
<li><a class="dropdown-item" href="/docs/1.0/xml/">v1.0 (XML)</a></li>
356358
<li style="padding:0"><hr class="dropdown-divider"/></li>
359+
<li><a class="dropdown-item" href="/docs/1.7/proto/">v1.7 (Protobuf)</a></li>
357360
<li><a class="dropdown-item" href="/docs/1.6/proto/">v1.6 (Protobuf)</a></li>
358361
<li><a class="dropdown-item" href="/docs/1.5/proto/">v1.5 (Protobuf)</a></li>
359362
<li><a class="dropdown-item" href="/docs/1.4/proto/">v1.4 (Protobuf)</a></li>

0 commit comments

Comments
 (0)