Skip to content

Commit

Permalink
[cascading] from release/10.4.0-rc to main (#1847)
Browse files Browse the repository at this point in the history
<!--
{"currentBranch":"release/10.4.0-rc","targetBranch":"main","bypassReviewers":false,"isConflicting":false}
-->

## Cascading from release/10.4.0-rc to main

---

:heavy_exclamation_mark: The pull request is conflicting with the target
branch.
You can fix the issue locally with the following commands:

<details open>
  <summary>Using <b>gh CLI</b></summary>

  ```shell
  gh pr checkout 1847
  git pull --ff origin main
  ```

  and update this Pull Request with

  ```shell
  gh pr push 1847
  ```
</details>

<details>
  <summary>Using <b>git</b> only</summary>

  ```shell
  git fetch origin
  git checkout origin/cascading/10.4.0-rc-main
  git pull --ff origin main
  ```

  and update this Pull Request with

  ```shell
  git push origin HEAD:cascading/10.4.0-rc-main
  ```
</details>

---

<small>This Pull Request has been generated with :heart: by the
[Otter](https://github.com/AmadeusITGroup/otter) cascading tool.</small>
  • Loading branch information
vscaiceanu-1a committed Jun 4, 2024
2 parents ccfb2ff + 1548a11 commit 83b91f5
Show file tree
Hide file tree
Showing 54 changed files with 750 additions and 608 deletions.
10 changes: 5 additions & 5 deletions apps/chrome-devtools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
],
"devDependencies": {
"@angular-devkit/build-angular": "~17.3.0",
"@angular-eslint/builder": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin-template": "~17.3.0",
"@angular-eslint/template-parser": "~17.3.0",
"@angular-eslint/builder": "~17.5.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@angular-eslint/eslint-plugin-template": "~17.5.0",
"@angular-eslint/template-parser": "~17.5.0",
"@angular/cli": "~17.3.0",
"@angular/compiler": "~17.3.0",
"@angular/compiler-cli": "~17.3.0",
Expand Down Expand Up @@ -66,7 +66,7 @@
"jest": "~29.7.0",
"jest-environment-jsdom": "~29.7.0",
"jest-junit": "~16.0.0",
"jest-preset-angular": "~14.0.3",
"jest-preset-angular": "~14.1.0",
"jsonc-eslint-parser": "~2.4.0",
"minimist": "^1.2.6",
"nx": "~18.3.0",
Expand Down
8 changes: 4 additions & 4 deletions apps/github-cascading-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"@actions/github": "^6.0.0",
"@angular-devkit/build-angular": "~17.3.0",
"@angular-devkit/core": "~17.3.0",
"@angular-eslint/builder": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin-template": "~17.3.0",
"@angular-eslint/builder": "~17.5.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@angular-eslint/eslint-plugin-template": "~17.5.0",
"@angular/animations": "~17.3.0",
"@angular/common": "~17.3.0",
"@angular/compiler": "~17.3.0",
Expand Down Expand Up @@ -59,7 +59,7 @@
"jest": "~29.7.0",
"jest-environment-jsdom": "~29.7.0",
"jest-junit": "~16.0.0",
"jest-preset-angular": "~14.0.3",
"jest-preset-angular": "~14.1.0",
"jsonc-eslint-parser": "~2.4.0",
"nock": "^13.0.5",
"nx": "~18.3.0",
Expand Down
8 changes: 4 additions & 4 deletions apps/showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@
"@angular-devkit/build-angular": "~17.3.0",
"@angular-devkit/core": "~17.3.0",
"@angular-devkit/schematics": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin-template": "~17.3.0",
"@angular-eslint/template-parser": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@angular-eslint/eslint-plugin-template": "~17.5.0",
"@angular-eslint/template-parser": "~17.5.0",
"@angular/cli": "~17.3.0",
"@angular/compiler-cli": "~17.3.0",
"@nx/eslint-plugin": "~18.3.0",
Expand Down Expand Up @@ -111,7 +111,7 @@
"jest": "~29.7.0",
"jest-environment-jsdom": "~29.7.0",
"jest-junit": "~16.0.0",
"jest-preset-angular": "~14.0.3",
"jest-preset-angular": "~14.1.0",
"jsonc-eslint-parser": "~2.4.0",
"lighthouse": "9.6.8",
"playwright-lighthouse": "2.2.2",
Expand Down
2 changes: 1 addition & 1 deletion apps/vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@
"@angular-devkit/build-angular": "~17.3.0",
"@angular-devkit/core": "~17.3.0",
"@angular-devkit/schematics": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@angular/animations": "~17.3.0",
"@angular/common": "~17.3.0",
"@angular/compiler": "~17.3.0",
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@
"@angular-devkit/build-angular": "~17.3.0",
"@angular-devkit/core": "~17.3.0",
"@angular-devkit/schematics": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin-template": "~17.3.0",
"@angular-eslint/template-parser": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@angular-eslint/eslint-plugin-template": "~17.5.0",
"@angular-eslint/template-parser": "~17.5.0",
"@angular/animations": "~17.3.0",
"@angular/cdk": "~17.3.0",
"@angular/cli": "~17.3.0",
Expand Down Expand Up @@ -224,7 +224,7 @@
"intl-messageformat": "~10.5.1",
"isomorphic-fetch": "~3.0.0",
"jest": "~29.7.0",
"jest-preset-angular": "~14.0.3",
"jest-preset-angular": "~14.1.0",
"js-yaml": "^4.1.0",
"jsonc-eslint-parser": "~2.4.0",
"jsonpath-plus": "^8.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@ama-sdk/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
"devDependencies": {
"@angular-devkit/core": "~17.3.0",
"@angular-devkit/schematics": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@angular/common": "~17.3.0",
"@angular/core": "~17.3.0",
"@nx/eslint-plugin": "~18.3.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/@ama-sdk/create/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"typescript": "~5.4.2"
},
"devDependencies": {
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin-template": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@angular-eslint/eslint-plugin-template": "~17.5.0",
"@nx/eslint": "~18.3.0",
"@nx/eslint-plugin": "~18.3.0",
"@nx/jest": "~18.3.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 @@ -69,7 +69,7 @@
"devDependencies": {
"@ama-sdk/core": "workspace:^",
"@angular-devkit/schematics-cli": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@angular/cli": "~17.3.0",
"@nx/eslint-plugin": "~18.3.0",
"@nx/jest": "~18.3.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/@ama-sdk/showcase-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@
"@angular-devkit/core": "~17.3.0",
"@angular-devkit/schematics": "~17.3.0",
"@angular-devkit/schematics-cli": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin-template": "~17.3.0",
"@angular-eslint/utils": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@angular-eslint/eslint-plugin-template": "~17.5.0",
"@angular-eslint/utils": "~17.5.0",
"@angular/compiler": "~17.3.0",
"@commitlint/cli": "^18.0.0",
"@commitlint/config-conventional": "^18.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@ama-sdk/swagger-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"tslib": "^2.6.2"
},
"devDependencies": {
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@nx/eslint-plugin": "~18.3.0",
"@nx/jest": "~18.3.0",
"@o3r/build-helpers": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion packages/@ama-terasu/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"ama": "dist/src/cli/ama.js"
},
"devDependencies": {
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@nx/eslint-plugin": "~18.3.0",
"@nx/jest": "~18.3.0",
"@o3r/amaterasu-api-spec": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion packages/@ama-terasu/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"prepare:publish": "prepare-publish ./dist"
},
"devDependencies": {
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@nx/eslint-plugin": "~18.3.0",
"@nx/jest": "~18.3.0",
"@o3r/build-helpers": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion packages/@ama-terasu/schematics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"tslib": "^2.6.2"
},
"devDependencies": {
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@nx/eslint-plugin": "~18.3.0",
"@nx/jest": "~18.3.0",
"@o3r/build-helpers": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion packages/@o3r/amaterasu/amaterasu-api-spec/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
],
"devDependencies": {
"@ama-terasu/core": "workspace:^",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@nx/eslint-plugin": "~18.3.0",
"@nx/jest": "~18.3.0",
"@o3r/build-helpers": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion packages/@o3r/amaterasu/amaterasu-dodo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"devDependencies": {
"@ama-terasu/core": "workspace:^",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@nx/eslint-plugin": "~18.3.0",
"@nx/jest": "~18.3.0",
"@o3r/build-helpers": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion packages/@o3r/amaterasu/amaterasu-otter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
"devDependencies": {
"@ama-terasu/core": "workspace:^",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@nx/eslint-plugin": "~18.3.0",
"@nx/jest": "~18.3.0",
"@o3r/build-helpers": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion packages/@o3r/amaterasu/amaterasu-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
],
"devDependencies": {
"@ama-terasu/core": "workspace:^",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@nx/eslint-plugin": "~18.3.0",
"@nx/jest": "~18.3.0",
"@o3r/build-helpers": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions packages/@o3r/analytics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"@angular-devkit/build-angular": "~17.3.0",
"@angular-devkit/core": "~17.3.0",
"@angular-devkit/schematics": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@angular/animations": "~17.3.0",
"@angular/common": "~17.3.0",
"@angular/compiler": "~17.3.0",
Expand Down Expand Up @@ -98,7 +98,7 @@
"jest": "~29.7.0",
"jest-environment-jsdom": "~29.7.0",
"jest-junit": "~16.0.0",
"jest-preset-angular": "~14.0.3",
"jest-preset-angular": "~14.1.0",
"jsonc-eslint-parser": "~2.4.0",
"nx": "~18.3.0",
"rxjs": "^7.8.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/@o3r/apis-manager/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@angular-devkit/build-angular": "~17.3.0",
"@angular-devkit/core": "~17.3.0",
"@angular-devkit/schematics": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@angular/animations": "~17.3.0",
"@angular/common": "~17.3.0",
"@angular/compiler": "~17.3.0",
Expand Down Expand Up @@ -82,7 +82,7 @@
"jest": "~29.7.0",
"jest-environment-jsdom": "~29.7.0",
"jest-junit": "~16.0.0",
"jest-preset-angular": "~14.0.3",
"jest-preset-angular": "~14.1.0",
"jsonc-eslint-parser": "~2.4.0",
"nx": "~18.3.0",
"pid-from-port": "^1.1.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/@o3r/application/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@angular-devkit/build-angular": "~17.3.0",
"@angular-devkit/core": "~17.3.0",
"@angular-devkit/schematics": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@angular/animations": "~17.3.0",
"@angular/common": "~17.3.0",
"@angular/compiler": "~17.3.0",
Expand Down Expand Up @@ -92,7 +92,7 @@
"jest": "~29.7.0",
"jest-environment-jsdom": "~29.7.0",
"jest-junit": "~16.0.0",
"jest-preset-angular": "~14.0.3",
"jest-preset-angular": "~14.1.0",
"jsonc-eslint-parser": "~2.4.0",
"nx": "~18.3.0",
"rxjs": "^7.8.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/@o3r/artifactory-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"devDependencies": {
"@angular-devkit/core": "~17.3.0",
"@angular-devkit/schematics": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@babel/core": "~7.24.0",
"@babel/preset-typescript": "~7.24.0",
"@compodoc/compodoc": "^1.1.19",
Expand Down
2 changes: 1 addition & 1 deletion packages/@o3r/azure-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"devDependencies": {
"@angular-devkit/core": "~17.3.0",
"@angular-devkit/schematics": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@babel/core": "~7.24.0",
"@babel/preset-typescript": "~7.24.0",
"@compodoc/compodoc": "^1.1.19",
Expand Down
4 changes: 2 additions & 2 deletions packages/@o3r/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
"@angular-devkit/build-angular": "~17.3.0",
"@angular-devkit/core": "~17.3.0",
"@angular-devkit/schematics": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@angular/animations": "~17.3.0",
"@angular/cdk": "~17.3.0",
"@angular/common": "~17.3.0",
Expand Down Expand Up @@ -159,7 +159,7 @@
"jest": "~29.7.0",
"jest-environment-jsdom": "~29.7.0",
"jest-junit": "~16.0.0",
"jest-preset-angular": "~14.0.3",
"jest-preset-angular": "~14.1.0",
"jsonc-eslint-parser": "~2.4.0",
"jsonpath-plus": "^8.0.0",
"memfs": "~4.9.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/@o3r/configuration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"@angular-devkit/build-angular": "~17.3.0",
"@angular-devkit/core": "~17.3.0",
"@angular-devkit/schematics": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@angular/animations": "~17.3.0",
"@angular/common": "~17.3.0",
"@angular/compiler": "~17.3.0",
Expand Down Expand Up @@ -116,7 +116,7 @@
"jest": "~29.7.0",
"jest-environment-jsdom": "~29.7.0",
"jest-junit": "~16.0.0",
"jest-preset-angular": "~14.0.3",
"jest-preset-angular": "~14.1.0",
"jsonc-eslint-parser": "~2.4.0",
"nx": "~18.3.0",
"pid-from-port": "^1.1.3",
Expand Down
8 changes: 4 additions & 4 deletions packages/@o3r/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"@angular-devkit/build-angular": "~17.3.0",
"@angular-devkit/core": "~17.3.0",
"@angular-devkit/schematics": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@angular/animations": "~17.3.0",
"@angular/cli": "~17.3.0",
"@angular/common": "~17.3.0",
Expand Down Expand Up @@ -129,7 +129,7 @@
"jest": "~29.7.0",
"jest-environment-jsdom": "~29.7.0",
"jest-junit": "~16.0.0",
"jest-preset-angular": "~14.0.3",
"jest-preset-angular": "~14.1.0",
"jsonc-eslint-parser": "~2.4.0",
"memfs": "~4.9.0",
"minimist": "^1.2.6",
Expand All @@ -145,7 +145,7 @@
"zone.js": "~0.14.2"
},
"generatorDependencies": {
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@angular/material": "~17.3.0",
"@ngrx/router-store": "~17.2.0",
"@ngrx/effects": "~17.2.0",
Expand All @@ -166,7 +166,7 @@
"eslint-plugin-unicorn": "^51.0.1",
"jest": "~29.7.0",
"jest-junit": "~16.0.0",
"jest-preset-angular": "~14.0.3",
"jest-preset-angular": "~14.1.0",
"zone.js": "~0.14.2"
},
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions packages/@o3r/create/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"@angular-devkit/architect": "~0.1703.0",
"@angular-devkit/core": "~17.3.0",
"@angular-devkit/schematics": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin-template": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@angular-eslint/eslint-plugin-template": "~17.5.0",
"@nx/eslint": "~18.3.0",
"@nx/eslint-plugin": "~18.3.0",
"@nx/jest": "~18.3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@o3r/design/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"@angular-devkit/build-angular": "~17.3.0",
"@angular-devkit/core": "~17.3.0",
"@angular-devkit/schematics": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@angular/animations": "~17.3.0",
"@angular/cli": "~17.3.0",
"@angular/common": "~17.3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@o3r/dev-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"devDependencies": {
"@angular-devkit/core": "~17.3.0",
"@angular-devkit/schematics": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.5.0",
"@babel/core": "~7.24.0",
"@babel/preset-typescript": "~7.24.0",
"@compodoc/compodoc": "^1.1.19",
Expand Down
Loading

0 comments on commit 83b91f5

Please sign in to comment.