Skip to content

Commit

Permalink
Merge branch 'release/11.6.0-rc' of https://github.com/AmadeusITGroup…
Browse files Browse the repository at this point in the history
…/otter into HEAD
  • Loading branch information
matthieu-crouzet committed Jan 8, 2025
2 parents 18b50b2 + 8a4d639 commit 1d3016b
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 3 deletions.
4 changes: 3 additions & 1 deletion .renovaterc.json5
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@
"org.openapitools:openapi-generator"
],
"groupName": "Open API updates",
"groupSlug": "openapi"
"groupSlug": "openapi",
// TODO wait for https://github.com/OpenAPITools/openapi-generator/issues/20135 to be fixed before upgrading to 7.10.0
"enabled": false
},
{
// We don't want to update this dep as we are still targeting a fork
Expand Down
1 change: 1 addition & 0 deletions apps/vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,7 @@
"@types/node": "^20.0.0",
"@types/vscode": "^1.67.0",
"@typescript-eslint/parser": "~8.19.0",
"@typescript-eslint/utils": "~8.19.0",
"@vscode/vsce": "^2.16.0",
"angular-eslint": "~18.4.0",
"cpy-cli": "^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@ama-sdk/schematics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
"tsc-watch": "^6.0.4",
"yaml-eslint-parser": "^1.2.2"
},
"openApiSupportedVersion": "~7.10.0",
"openApiSupportedVersion": "~7.9.0",
"engines": {
"node": "^18.19.1 || ^20.11.1 || >=22.0.0"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@
<dependency>
<groupId>org.openapitools</groupId>
<artifactId>openapi-generator</artifactId>
<version>7.10.0</version>
<!-- TODO wait for https://github.com/OpenAPITools/openapi-generator/issues/20135 to be fixed before upgrading to 7.10.0 -->
<!-- Don't forget to enable the custom manager in .renovaterc.json5 -->
<version>7.9.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
1 change: 1 addition & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -29961,6 +29961,7 @@ __metadata:
"@types/node": "npm:^20.0.0"
"@types/vscode": "npm:^1.67.0"
"@typescript-eslint/parser": "npm:~8.19.0"
"@typescript-eslint/utils": "npm:~8.19.0"
"@vscode/vsce": "npm:^2.16.0"
angular-eslint: "npm:~18.4.0"
cpy-cli: "npm:^5.0.0"
Expand Down

0 comments on commit 1d3016b

Please sign in to comment.