Skip to content

Commit

Permalink
Fix of recent merges
Browse files Browse the repository at this point in the history
  • Loading branch information
e-backmark-ericsson committed Jan 5, 2024
1 parent 454a49f commit 4867b34
Show file tree
Hide file tree
Showing 3 changed files with 196 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ _description: The EiffelActivityCanceledEvent signals that a previously
type: object
properties:
meta:
$ref: ../EiffelMetaProperty/3.1.1.yml
$ref: ../EiffelMetaProperty/3.1.0.yml
data:
type: object
properties:
Expand All @@ -34,18 +34,12 @@ properties:
customData:
type: array
items:
$ref: ../EiffelCustomDataProperty/1.0.1.yml
$ref: ../EiffelCustomDataProperty/1.0.0.yml
additionalProperties: false
links:
type: array
contains:
type: object
properties:
type:
enum:
- ACTIVITY_EXECUTION
items:
$ref: ../EiffelEventLink/1.1.2.yml
$ref: ../EiffelEventLink/1.1.1.yml
required:
- meta
- data
Expand Down Expand Up @@ -100,8 +94,10 @@ _links:
types:
- EiffelFlowContextDefinedEvent
_history:
- version: 3.2.1
- version: 4.0.1
changes: Updated meta schema to Draft 2020-12.
- version: 4.0.0
changes: Fix bug in schema regarding additionalProperties (see [Issue 376](https://github.com/eiffel-community/eiffel/issues/376)).
- version: 3.2.0
introduced_in: edition-arica
changes: Add schema URL to the meta object (see [Issue 280](https://github.com/eiffel-community/eiffel/issues/280)).
Expand Down
3 changes: 2 additions & 1 deletion eiffel-vocabulary/EiffelActivityCanceledEvent.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!---
This file was generated from ../definitions/EiffelActivityCanceledEvent/4.0.0.yml.
This file was generated from ../definitions/EiffelActivityCanceledEvent/4.0.1.yml.
See that file for a copyright notice.
--->

Expand Down Expand Up @@ -177,6 +177,7 @@ __Description:__ A URI pointing at a location from where the schema used when cr

| Version | Introduced in | Changes |
| ------- | ------------- | ------- |
| 4.0.1 | Not yet released in an edition | Updated meta schema to Draft 2020-12. |
| 4.0.0 | Not yet released in an edition | Fix bug in schema regarding additionalProperties (see [Issue 376](https://github.com/eiffel-community/eiffel/issues/376)). |
| 3.2.0 | [edition-arica](../../../tree/edition-arica) | Add schema URL to the meta object (see [Issue 280](https://github.com/eiffel-community/eiffel/issues/280)). |
| 3.1.0 | [edition-lyon](../../../tree/edition-lyon) | Add links.domainId member (see [Issue 233](https://github.com/eiffel-community/eiffel/issues/233)). |
Expand Down
188 changes: 188 additions & 0 deletions schemas/EiffelActivityCanceledEvent/4.0.1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,188 @@
{
"$schema": "https://json-schema.org/draft/draft-2020-12/schema#",
"type": "object",
"properties": {
"meta": {
"type": "object",
"properties": {
"id": {
"type": "string",
"pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
},
"type": {
"type": "string",
"enum": [
"EiffelActivityCanceledEvent"
]
},
"version": {
"type": "string",
"enum": [
"4.0.1"
],
"default": "4.0.1"
},
"time": {
"type": "integer"
},
"tags": {
"type": "array",
"items": {
"type": "string"
}
},
"source": {
"type": "object",
"properties": {
"domainId": {
"type": "string"
},
"host": {
"type": "string"
},
"name": {
"type": "string"
},
"serializer": {
"type": "string",
"pattern": "^pkg:"
},
"uri": {
"type": "string"
}
},
"additionalProperties": false
},
"security": {
"type": "object",
"properties": {
"authorIdentity": {
"type": "string"
},
"integrityProtection": {
"type": "object",
"properties": {
"signature": {
"type": "string"
},
"alg": {
"type": "string",
"enum": [
"HS256",
"HS384",
"HS512",
"RS256",
"RS384",
"RS512",
"ES256",
"ES384",
"ES512",
"PS256",
"PS384",
"PS512"
]
},
"publicKey": {
"type": "string"
}
},
"required": [
"signature",
"alg"
],
"additionalProperties": false
},
"sequenceProtection": {
"type": "array",
"items": {
"type": "object",
"properties": {
"sequenceName": {
"type": "string"
},
"position": {
"type": "integer"
}
},
"additionalProperties": false,
"required": [
"sequenceName",
"position"
]
}
}
},
"additionalProperties": false,
"required": [
"authorIdentity"
]
},
"schemaUri": {
"type": "string"
}
},
"required": [
"id",
"type",
"version",
"time"
],
"additionalProperties": false
},
"data": {
"type": "object",
"properties": {
"reason": {
"type": "string"
},
"customData": {
"type": "array",
"items": {
"type": "object",
"properties": {
"key": {
"type": "string"
},
"value": {}
},
"required": [
"key",
"value"
],
"additionalProperties": false
}
}
},
"additionalProperties": false
},
"links": {
"type": "array",
"items": {
"type": "object",
"properties": {
"type": {
"type": "string"
},
"target": {
"type": "string",
"pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$"
},
"domainId": {
"type": "string"
}
},
"required": [
"type",
"target"
],
"additionalProperties": false
}
}
},
"required": [
"meta",
"data",
"links"
],
"additionalProperties": false
}

0 comments on commit 4867b34

Please sign in to comment.