Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.6] Upgrade json5 dependency (2.2.1 → 2.2.3) (#148326) #148476

Merged
merged 1 commit into from
Jan 5, 2023

Conversation

kibanamachine
Copy link
Contributor

Backport

This will backport the following commits from main to 8.6:

Questions ?

Please refer to the Backport tool documentation

Upgrade json5 production dependency (2.2.1 → 2.2.3).
Upgrade json5 dev dependency (1.0.1 → 1.0.2)
Also upgrades production dependency types/json5 to 2.2.0.

Change log (json5):
https://github.com/json5/json5/blob/main/CHANGELOG.md#v223-code-diff

cc https://github.com/orgs/elastic/teams/kibana-security

Co-authored-by: Thomas Watson <[email protected]>
(cherry picked from commit 1037f36)
@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

Unknown metric groups

ESLint disabled in files

id before after diff
osquery 1 2 +1

ESLint disabled line counts

id before after diff
enterpriseSearch 19 21 +2
fleet 59 65 +6
osquery 108 113 +5
securitySolution 441 447 +6
total +19

Total ESLint disabled count

id before after diff
enterpriseSearch 20 22 +2
fleet 68 74 +6
osquery 109 115 +6
securitySolution 518 524 +6
total +20

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cc @jeramysoucy

@kibanamachine kibanamachine merged commit 5213e30 into elastic:8.6 Jan 5, 2023
jeramysoucy added a commit that referenced this pull request Jan 12, 2023
# Backport

This will backport the following commits from `main` to `7.17`:
- [Upgrade json5 dependency (2.2.1 → 2.2.3)
(#148326)](#148326)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Jeramy
Soucy","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-01-05T18:29:39Z","message":"Upgrade
json5 dependency (2.2.1 → 2.2.3) (#148326)\n\nUpgrade json5 production
dependency (2.2.1 → 2.2.3).\r\nUpgrade json5 dev dependency (1.0.1 →
1.0.2) \r\nAlso upgrades production dependency types/json5 to
2.2.0.\r\n\r\nChange log
(json5):\r\nhttps://github.com/json5/json5/blob/main/CHANGELOG.md#v223-code-diff\r\n\r\ncc
https://github.com/orgs/elastic/teams/kibana-security\r\n\r\nCo-authored-by:
Thomas Watson
<[email protected]>","sha":"1037f3669edb930c4ca27a1891adc2a36bf265c7","branchLabelMapping":{"^v8.7.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Security","release_note:skip","backport:all-open","v8.7.0","v8.6.1","v8.5.4"],"number":148326,"url":"https://github.com/elastic/kibana/pull/148326","mergeCommit":{"message":"Upgrade
json5 dependency (2.2.1 → 2.2.3) (#148326)\n\nUpgrade json5 production
dependency (2.2.1 → 2.2.3).\r\nUpgrade json5 dev dependency (1.0.1 →
1.0.2) \r\nAlso upgrades production dependency types/json5 to
2.2.0.\r\n\r\nChange log
(json5):\r\nhttps://github.com/json5/json5/blob/main/CHANGELOG.md#v223-code-diff\r\n\r\ncc
https://github.com/orgs/elastic/teams/kibana-security\r\n\r\nCo-authored-by:
Thomas Watson
<[email protected]>","sha":"1037f3669edb930c4ca27a1891adc2a36bf265c7"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.7.0","labelRegex":"^v8.7.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/148326","number":148326,"mergeCommit":{"message":"Upgrade
json5 dependency (2.2.1 → 2.2.3) (#148326)\n\nUpgrade json5 production
dependency (2.2.1 → 2.2.3).\r\nUpgrade json5 dev dependency (1.0.1 →
1.0.2) \r\nAlso upgrades production dependency types/json5 to
2.2.0.\r\n\r\nChange log
(json5):\r\nhttps://github.com/json5/json5/blob/main/CHANGELOG.md#v223-code-diff\r\n\r\ncc
https://github.com/orgs/elastic/teams/kibana-security\r\n\r\nCo-authored-by:
Thomas Watson
<[email protected]>","sha":"1037f3669edb930c4ca27a1891adc2a36bf265c7"}},{"branch":"8.6","label":"v8.6.1","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/148476","number":148476,"state":"MERGED","mergeCommit":{"sha":"5213e30e4991ac56da8fedbff6009e8021f97435","message":"[8.6]
Upgrade json5 dependency (2.2.1 → 2.2.3) (#148326) (#148476)\n\n#
Backport\n\nThis will backport the following commits from `main` to
`8.6`:\n- [Upgrade json5 dependency (2.2.1 →
2.2.3)\n(#148326)](https://github.com/elastic/kibana/pull/148326)\n\n<!---
Backport version: 8.9.7 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT
[{\"author\":{\"name\":\"Jeramy\nSoucy\",\"email\":\"[email protected]\"},\"sourceCommit\":{\"committedDate\":\"2023-01-05T18:29:39Z\",\"message\":\"Upgrade\njson5
dependency (2.2.1 → 2.2.3) (#148326)\\n\\nUpgrade json5
production\ndependency (2.2.1 → 2.2.3).\\r\\nUpgrade json5 dev
dependency (1.0.1 →\n1.0.2) \\r\\nAlso upgrades production dependency
types/json5 to\n2.2.0.\\r\\n\\r\\nChange
log\n(json5):\\r\\nhttps://github.com/json5/json5/blob/main/CHANGELOG.md#v223-code-diff\\r\\n\\r\\ncc\nhttps://github.com/orgs/elastic/teams/kibana-security\\r\\n\\r\\nCo-authored-by:\nThomas
Watson\n<[email protected]>\",\"sha\":\"1037f3669edb930c4ca27a1891adc2a36bf265c7\",\"branchLabelMapping\":{\"^v8.7.0$\":\"main\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"Team:Security\",\"release_note:skip\",\"backport:all-open\",\"v8.7.0\"],\"number\":148326,\"url\":\"https://github.com/elastic/kibana/pull/148326\",\"mergeCommit\":{\"message\":\"Upgrade\njson5
dependency (2.2.1 → 2.2.3) (#148326)\\n\\nUpgrade json5
production\ndependency (2.2.1 → 2.2.3).\\r\\nUpgrade json5 dev
dependency (1.0.1 →\n1.0.2) \\r\\nAlso upgrades production dependency
types/json5 to\n2.2.0.\\r\\n\\r\\nChange
log\n(json5):\\r\\nhttps://github.com/json5/json5/blob/main/CHANGELOG.md#v223-code-diff\\r\\n\\r\\ncc\nhttps://github.com/orgs/elastic/teams/kibana-security\\r\\n\\r\\nCo-authored-by:\nThomas
Watson\n<[email protected]>\",\"sha\":\"1037f3669edb930c4ca27a1891adc2a36bf265c7\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[],\"targetPullRequestStates\":[{\"branch\":\"main\",\"label\":\"v8.7.0\",\"labelRegex\":\"^v8.7.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/148326\",\"number\":148326,\"mergeCommit\":{\"message\":\"Upgrade\njson5
dependency (2.2.1 → 2.2.3) (#148326)\\n\\nUpgrade json5
production\ndependency (2.2.1 → 2.2.3).\\r\\nUpgrade json5 dev
dependency (1.0.1 →\n1.0.2) \\r\\nAlso upgrades production dependency
types/json5 to\n2.2.0.\\r\\n\\r\\nChange
log\n(json5):\\r\\nhttps://github.com/json5/json5/blob/main/CHANGELOG.md#v223-code-diff\\r\\n\\r\\ncc\nhttps://github.com/orgs/elastic/teams/kibana-security\\r\\n\\r\\nCo-authored-by:\nThomas
Watson\n<[email protected]>\",\"sha\":\"1037f3669edb930c4ca27a1891adc2a36bf265c7\"}}]}]\nBACKPORT-->\n\nCo-authored-by:
Jeramy Soucy
<[email protected]>"}},{"branch":"8.5","label":"v8.5.4","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/148475","number":148475,"state":"MERGED","mergeCommit":{"sha":"c727fa2f8d4abdb6b1f87fc8ecc6029a38ae1ca1","message":"[8.5]
Upgrade json5 dependency (2.2.1 → 2.2.3) (#148326) (#148475)\n\n#
Backport\n\nThis will backport the following commits from `main` to
`8.5`:\n- [Upgrade json5 dependency (2.2.1 →
2.2.3)\n(#148326)](https://github.com/elastic/kibana/pull/148326)\n\n<!---
Backport version: 8.9.7 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT
[{\"author\":{\"name\":\"Jeramy\nSoucy\",\"email\":\"[email protected]\"},\"sourceCommit\":{\"committedDate\":\"2023-01-05T18:29:39Z\",\"message\":\"Upgrade\njson5
dependency (2.2.1 → 2.2.3) (#148326)\\n\\nUpgrade json5
production\ndependency (2.2.1 → 2.2.3).\\r\\nUpgrade json5 dev
dependency (1.0.1 →\n1.0.2) \\r\\nAlso upgrades production dependency
types/json5 to\n2.2.0.\\r\\n\\r\\nChange
log\n(json5):\\r\\nhttps://github.com/json5/json5/blob/main/CHANGELOG.md#v223-code-diff\\r\\n\\r\\ncc\nhttps://github.com/orgs/elastic/teams/kibana-security\\r\\n\\r\\nCo-authored-by:\nThomas
Watson\n<[email protected]>\",\"sha\":\"1037f3669edb930c4ca27a1891adc2a36bf265c7\",\"branchLabelMapping\":{\"^v8.7.0$\":\"main\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"Team:Security\",\"release_note:skip\",\"backport:all-open\",\"v8.7.0\"],\"number\":148326,\"url\":\"https://github.com/elastic/kibana/pull/148326\",\"mergeCommit\":{\"message\":\"Upgrade\njson5
dependency (2.2.1 → 2.2.3) (#148326)\\n\\nUpgrade json5
production\ndependency (2.2.1 → 2.2.3).\\r\\nUpgrade json5 dev
dependency (1.0.1 →\n1.0.2) \\r\\nAlso upgrades production dependency
types/json5 to\n2.2.0.\\r\\n\\r\\nChange
log\n(json5):\\r\\nhttps://github.com/json5/json5/blob/main/CHANGELOG.md#v223-code-diff\\r\\n\\r\\ncc\nhttps://github.com/orgs/elastic/teams/kibana-security\\r\\n\\r\\nCo-authored-by:\nThomas
Watson\n<[email protected]>\",\"sha\":\"1037f3669edb930c4ca27a1891adc2a36bf265c7\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[],\"targetPullRequestStates\":[{\"branch\":\"main\",\"label\":\"v8.7.0\",\"labelRegex\":\"^v8.7.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/148326\",\"number\":148326,\"mergeCommit\":{\"message\":\"Upgrade\njson5
dependency (2.2.1 → 2.2.3) (#148326)\\n\\nUpgrade json5
production\ndependency (2.2.1 → 2.2.3).\\r\\nUpgrade json5 dev
dependency (1.0.1 →\n1.0.2) \\r\\nAlso upgrades production dependency
types/json5 to\n2.2.0.\\r\\n\\r\\nChange
log\n(json5):\\r\\nhttps://github.com/json5/json5/blob/main/CHANGELOG.md#v223-code-diff\\r\\n\\r\\ncc\nhttps://github.com/orgs/elastic/teams/kibana-security\\r\\n\\r\\nCo-authored-by:\nThomas
Watson\n<[email protected]>\",\"sha\":\"1037f3669edb930c4ca27a1891adc2a36bf265c7\"}}]}]\nBACKPORT-->\n\nCo-authored-by:
Jeramy Soucy <[email protected]>"}}]}] BACKPORT-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants