Skip to content

Commit 65e7dcf

Browse files
committed
Merge remote-tracking branch 'CycloneDX/main' into feat/find-by-identifier
2 parents 6607f93 + be9c76b commit 65e7dcf

File tree

2 files changed

+39
-39
lines changed

2 files changed

+39
-39
lines changed

spec/openapi.yaml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ paths:
5757
$ref: "#/components/responses/paginated-product"
5858
'400':
5959
$ref: "#/components/responses/400-invalid-request"
60-
'404':
61-
$ref: "#/components/responses/404-object-by-id-not-found"
6260
tags:
6361
- TEA Product
6462
/component/{uuid}:
@@ -229,6 +227,7 @@ components:
229227
description: Timestamp
230228
format: date-time
231229
pattern: "^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}Z$"
230+
example: '2024-03-20T15:30:00Z'
232231
identifier:
233232
type: object
234233
description: An identifier with a specified type
@@ -347,10 +346,11 @@ components:
347346
version:
348347
description: Version number
349348
type: string
350-
release_date:
349+
example: 1.2.3
350+
releaseDate:
351351
description: Timestamp of the release (for sorting purposes)
352352
"$ref": "#/components/schemas/date-time"
353-
pre_release:
353+
preRelease:
354354
type: boolean
355355
description: |
356356
A flag indicating pre-release (or beta) status.
@@ -364,27 +364,27 @@ components:
364364
required:
365365
- uuid
366366
- version
367-
- release_date
367+
- releaseDate
368368
examples:
369369
# Apache Tomcat 11.0.6
370370
- uuid: 605d0ecb-1057-40e4-9abf-c400b10f0345
371371
version: "11.0.6"
372-
release_date: 2025-04-01T15:43:00Z
372+
releaseDate: 2025-04-01T15:43:00Z
373373
identifiers:
374374
- idType: purl
375375
idValue: pkg:maven/org.apache.tomcat/tomcat@11.0.6
376376
# Different release of Apache Tomcat
377377
- uuid: da89e38e-95e7-44ca-aa7d-f3b6b34c7fab
378378
version: "10.1.40"
379-
release_date: 2025-04-01T18:20:00Z
379+
releaseDate: 2025-04-01T18:20:00Z
380380
identifiers:
381381
- idType: purl
382382
idValue: pkg:maven/org.apache.tomcat/tomcat@10.1.40
383383
# A pre-release of Apache Tomcat
384384
- uuid: 95f481df-f760-47f4-b2f2-f8b76d858450
385385
version: "11.0.0-M26"
386-
release_date: 2024-09-13T17:49:00Z
387-
pre_release: true
386+
releaseDate: 2024-09-13T17:49:00Z
387+
preRelease: true
388388
identifiers:
389389
- idType: purl
390390
idValue: pkg:maven/org.apache.tomcat/tomcat@11.0.0-M26
@@ -407,10 +407,10 @@ components:
407407
description: |
408408
TEA Collection version, incremented each time its content changes.
409409
Versions start with 1.
410-
release_date:
411-
description: TEA Collection version release date.
410+
date:
411+
description: The date when the TEA Collection version was created.
412412
"$ref": "#/components/schemas/date-time"
413-
update_reason:
413+
updateReason:
414414
description: Reason for the update/release of the TEA Collection object.
415415
"$ref": "#/components/schemas/collection-update-reason"
416416
artifacts:
@@ -421,9 +421,9 @@ components:
421421
examples:
422422
# Documents in the latest release of Log4j Core
423423
- uuid: 4c72fe22-9d83-4c2f-8eba-d6db484f32c8
424-
version: 1
425-
release_date: 2024-12-13T00:00:00Z
426-
update_reason:
424+
version: 3
425+
date: 2024-12-13T00:00:00Z
426+
updateReason:
427427
type: ARTIFACT_UPDATED
428428
comment: VDR file updated
429429
artifacts:
@@ -572,7 +572,7 @@ components:
572572
type: string
573573
description: Direct download URL for the artifact
574574
format: url
575-
signature_url:
575+
signatureUrl:
576576
type: string
577577
description: Direct download URL for an external signature of the artifact
578578
format: url
@@ -616,22 +616,22 @@ components:
616616
type: string
617617
format: date-time
618618
example: '2024-03-20T15:30:00Z'
619-
page_start_index:
620-
type: number
619+
pageStartIndex:
620+
type: integer
621621
format: int64
622622
default: 0
623-
page_size:
624-
type: number
623+
pageSize:
624+
type: integer
625625
format: int64
626626
default: 100
627-
total_results:
628-
type: number
627+
totalResults:
628+
type: integer
629629
format: int64
630630
required:
631631
- timestamp
632-
- page_start_index
633-
- page_size
634-
- total_results
632+
- pageStartIndex
633+
- pageSize
634+
- totalResults
635635
responses:
636636
204-common-delete:
637637
description: Object deleted successfully
@@ -665,21 +665,21 @@ components:
665665
parameters:
666666
# Pagination
667667
page-offset:
668-
name: page-offset
668+
name: pageOffset
669669
description: Pagination offset
670670
in: query
671671
required: false
672672
schema:
673-
type: number
673+
type: integer
674674
format: int64
675675
default: 0
676676
page-size:
677-
name: page-size
677+
name: pageSize
678678
description: Pagination offset
679679
in: query
680680
required: false
681681
schema:
682-
type: number
682+
type: integer
683683
format: int64
684684
default: 100
685685
#

tea-collection/tea-collection.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ A TEA Component Release object has the following parts:
1111

1212
- __uuid__: A unique identifier for the TEA Component Release
1313
- __version__: Version number
14-
- __release_date__: Timestamp of the release (for sorting purposes)
15-
- __pre_release__: A flag indicating pre-release (or beta) status.
14+
- __releaseDate__: Timestamp of the release (for sorting purposes)
15+
- __preRelease__: A flag indicating pre-release (or beta) status.
1616
May be disabled after the creation of the release object, but can't be enabled after creation of an object.
1717
- __identifiers__: List of identifiers for the component
1818
- __idType__: Type of identifier, e.g. `tei`, `purl`, `cpe`
@@ -26,7 +26,7 @@ A TEA Component Release object of the binary distribution of Apache Tomcat 11.0.
2626
{
2727
"uuid": "605d0ecb-1057-40e4-9abf-c400b10f0345",
2828
"version": "11.0.6",
29-
"release_date": "2025-04-01T15:43:00Z",
29+
"releaseDate": "2025-04-01T15:43:00Z",
3030
"identifiers": [
3131
{
3232
"idType": "purl",
@@ -42,7 +42,7 @@ Different versions of Apache Tomcat should have separate TEA Component Release o
4242
{
4343
"uuid": "da89e38e-95e7-44ca-aa7d-f3b6b34c7fab",
4444
"version": "10.1.4",
45-
"release_date": "2025-04-01T18:20:00Z",
45+
"releaseDate": "2025-04-01T18:20:00Z",
4646
"identifiers": [
4747
{
4848
"idType": "purl",
@@ -59,8 +59,8 @@ and does not require users to know the version naming scheme adopted by the proj
5959
{
6060
"uuid": "95f481df-f760-47f4-b2f2-f8b76d858450",
6161
"version": "11.0.0-M26",
62-
"release_date": "2024-09-13T17:49:00Z",
63-
"pre_release": true,
62+
"releaseDate": "2024-09-13T17:49:00Z",
63+
"preRelease": true,
6464
"identifiers": [
6565
{
6666
"idType": "purl",
@@ -113,8 +113,8 @@ The TEA Collection object has the following parts:
113113
When updating a collection, only the `version` is changed.
114114
- __version__: TEA Collection version, incremented each time its content changes.
115115
Versions start with 1.
116-
- __release_date__: TEA Collection version release date.
117-
- __update_reason__: Reason for the update/release of the TEA Collection object.
116+
- __releaseDate__: TEA Collection version release date.
117+
- __updateReason__: Reason for the update/release of the TEA Collection object.
118118
- __type__: Type of update reason.
119119
See [reasons for TEA Collection update](#the-reason-for-tco-update-enum) below.
120120
- __comment__: Free text description.
@@ -163,8 +163,8 @@ producing different alerts than other changes of a collection.
163163
{
164164
"uuid": "4c72fe22-9d83-4c2f-8eba-d6db484f32c8",
165165
"version": 1,
166-
"release_date": "2024-12-13T00:00:00Z",
167-
"update_reason": {
166+
"releaseDate": "2024-12-13T00:00:00Z",
167+
"updateReason": {
168168
"type": "ARTIFACT_UPDATED",
169169
"comment": "VDR file updated"
170170
},

0 commit comments

Comments
 (0)