Skip to content

Commit

Permalink
Merge pull request #948 from floydtree/v1.1.0-sync
Browse files Browse the repository at this point in the history
Updating versions to 1.2.0-dev, syncing changes done in v1.1.0
  • Loading branch information
mikeradka authored Jan 25, 2024
2 parents 9ba1bc1 + ef4bee4 commit 26de149
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 22 deletions.
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,7 @@ Thankyou! -->
6. Deprecated `Security Finding` class to be replaced by the new specific classes according to the use-case: `Vulnerability Finding`, `Compliance Finding`, `Detection Finding`, `Incident Finding`. #877
7. Deprecated `Web Resources Access Activity` event class. #890
8. Deprecated `Network File Activity` event class in favor of `File Hosting Activity `#917
9. Deprecated `extensions` attribute to be replaced by `schema_extension_list` attribute which is used in the `metadata` object. #934
10. Deprecated `extension_list` in TLS object in favor of `tls_extension_list`. #936
9. Deprecated `extension_list` in TLS object in favor of `tls_extension_list`. #936

### Breaking changes
`n/a`
Expand Down
14 changes: 7 additions & 7 deletions dictionary.json
Original file line number Diff line number Diff line change
Expand Up @@ -1515,13 +1515,19 @@
},
"extension": {
"@deprecated": {
"message": "Use the <code> schema_extension_list </code> attribute instead.",
"message": "Use the <code> extensions </code> attribute instead.",
"since": "1.1.0"
},
"caption": "Schema Extension",
"description": "The schema extension used to create the event.",
"type": "extension"
},
"extensions": {
"caption": "Schema Extensions",
"description": "The schema extensions used to create the event.",
"is_array": true,
"type": "extension"
},
"extension_list": {
"@deprecated": {
"message": "Use the <code> tls_extension_list </code> attribute instead.",
Expand Down Expand Up @@ -3138,12 +3144,6 @@
"description": "The unique identifier of the schedule associated with a scan job.",
"type": "string_t"
},
"schema_extension_list": {
"caption": "Schema Extension List",
"description": "The list of schema extensions used to create the event.",
"is_array": true,
"type": "extension"
},
"scheme": {
"caption": "Scheme",
"description": "The scheme portion of the URL. For example: <code>http</code>, <code>https</code>, <code>ftp</code>, or <code>sftp</code>.",
Expand Down
2 changes: 1 addition & 1 deletion extensions/linux/extension.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"description": "The Linux extension defines Linux specific attributes, objects and classes.",
"name": "linux",
"uid": 1,
"version": "1.1.0"
"version": "1.2.0-dev"
}
2 changes: 1 addition & 1 deletion extensions/macos/extension.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"description": "The macOS extension defines macOS specific attributes, objects and classes.",
"name": "macos",
"uid": 3,
"version": "1.1.0"
"version": "1.2.0-dev"
}
2 changes: 1 addition & 1 deletion extensions/windows/extension.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"description": "The Windows extension defines Windows specific attributes, objects and classes.",
"name": "win",
"uid": 2,
"version": "1.1.0"
"version": "1.2.0-dev"
}
6 changes: 3 additions & 3 deletions objects/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
"extension": {
"requirement": "optional"
},
"extensions": {
"requirement": "optional"
},
"labels": {
"description": "<p>The list of category labels attached to the event or specific attributes. Labels are user defined tags or aliases added at normalization time.</p>For example: <code>[\"network\", \"connection.ip:destination\", \"device.ip:source\"]</code>",
"requirement": "optional"
Expand Down Expand Up @@ -49,9 +52,6 @@
"profiles": {
"requirement": "optional"
},
"schema_extension_list": {
"requirement": "optional"
},
"sequence": {
"requirement": "optional"
},
Expand Down
8 changes: 2 additions & 6 deletions objects/security_state.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,18 +102,14 @@
"description": "Mobile OTA (Over The Air) updates have been disabled."
},
"21": {
"caption": "iOS file system altered",
"description": "The iOS file system has been altered."
},
"22": {
"caption": "Rooted",
"description": "The device has been modified to allow root access."
},
"23": {
"22": {
"caption": "Android partition modified",
"description": "The Android partition has been modified."
},
"24": {
"23": {
"caption": "Compliance failure",
"description": "The entity is not compliant with the associated security policy."
}
Expand Down
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.1.0"
"version": "1.2.0-dev"
}

0 comments on commit 26de149

Please sign in to comment.