Skip to content

Commit

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

## Cascading from release/10.4 to release/11.0





---

: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 2300
  git pull --ff origin release/11.0
  ```

  and update this Pull Request with

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

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

  ```shell
  git fetch origin
  git checkout origin/cascading/10.4.0-11.0.0
  git pull --ff origin release/11.0
  ```

  and update this Pull Request with

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



---

<small>This Pull Request has been generated with :heart: by the
[Otter](https://github.com/AmadeusITGroup/otter) cascading tool.</small>
  • Loading branch information
cpaulve-1A authored Oct 18, 2024
2 parents dd9d5df + 2f00634 commit 98b421e
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@
"jest-preset-angular": "~14.1.0",
"js-yaml": "^4.1.0",
"jsonc-eslint-parser": "~2.4.0",
"jsonpath-plus": "^9.0.0",
"jsonpath-plus": "~10.0.0",
"lighthouse": "9.6.8",
"lint-staged": "^15.0.0",
"minimist": "^1.2.6",
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 @@ -60,7 +60,7 @@
"@yarnpkg/plugin-pack": "^4.0.0",
"chokidar": "^3.5.2",
"globby": "^11.1.0",
"jsonpath-plus": "^9.0.0",
"jsonpath-plus": ">= 9.0.0",
"rxjs": "^7.8.1",
"semver": "^7.5.2",
"typescript": "~5.4.2"
Expand Down Expand Up @@ -192,7 +192,7 @@
"jest-junit": "~16.0.0",
"jest-preset-angular": "~14.1.0",
"jsonc-eslint-parser": "~2.4.0",
"jsonpath-plus": "^9.0.0",
"jsonpath-plus": "~10.0.0",
"memfs": "~4.9.0",
"nx": "~19.3.0",
"pid-from-port": "^1.1.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/@o3r/rules-engine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"@schematics/angular": "~18.0.0",
"globby": "^11.1.0",
"jasmine": "^5.0.0",
"jsonpath-plus": "^9.0.0",
"jsonpath-plus": ">= 9.0.0",
"rxjs": "^7.8.1",
"typescript": "~5.4.2",
"typescript-json-schema": "~0.64.0"
Expand Down Expand Up @@ -143,7 +143,7 @@
"jest-junit": "~16.0.0",
"jest-preset-angular": "~14.1.0",
"jsonc-eslint-parser": "~2.4.0",
"jsonpath-plus": "^9.0.0",
"jsonpath-plus": "~10.0.0",
"memfs": "~4.9.0",
"nx": "~19.3.0",
"pid-from-port": "^1.1.3",
Expand Down
28 changes: 14 additions & 14 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7187,7 +7187,7 @@ __metadata:
jest-junit: "npm:~16.0.0"
jest-preset-angular: "npm:~14.1.0"
jsonc-eslint-parser: "npm:~2.4.0"
jsonpath-plus: "npm:^9.0.0"
jsonpath-plus: "npm:~10.0.0"
memfs: "npm:~4.9.0"
nx: "npm:~19.3.0"
pid-from-port: "npm:^1.1.3"
Expand Down Expand Up @@ -7230,7 +7230,7 @@ __metadata:
"@yarnpkg/plugin-pack": ^4.0.0
chokidar: ^3.5.2
globby: ^11.1.0
jsonpath-plus: ^9.0.0
jsonpath-plus: ">= 9.0.0"
rxjs: ^7.8.1
semver: ^7.5.2
typescript: ~5.4.2
Expand Down Expand Up @@ -8218,7 +8218,7 @@ __metadata:
jest-preset-angular: "npm:~14.1.0"
js-yaml: "npm:^4.1.0"
jsonc-eslint-parser: "npm:~2.4.0"
jsonpath-plus: "npm:^9.0.0"
jsonpath-plus: "npm:~10.0.0"
lighthouse: "npm:9.6.8"
lint-staged: "npm:^15.0.0"
minimist: "npm:^1.2.6"
Expand Down Expand Up @@ -8786,7 +8786,7 @@ __metadata:
jest-junit: "npm:~16.0.0"
jest-preset-angular: "npm:~14.1.0"
jsonc-eslint-parser: "npm:~2.4.0"
jsonpath-plus: "npm:^9.0.0"
jsonpath-plus: "npm:~10.0.0"
memfs: "npm:~4.9.0"
nx: "npm:~19.3.0"
pid-from-port: "npm:^1.1.3"
Expand Down Expand Up @@ -8819,7 +8819,7 @@ __metadata:
"@schematics/angular": ~18.0.0
globby: ^11.1.0
jasmine: ^5.0.0
jsonpath-plus: ^9.0.0
jsonpath-plus: ">= 9.0.0"
rxjs: ^7.8.1
typescript: ~5.4.2
typescript-json-schema: ~0.64.0
Expand Down Expand Up @@ -23004,10 +23004,10 @@ __metadata:
languageName: node
linkType: hard

"jsep@npm:^1.3.8":
version: 1.3.8
resolution: "jsep@npm:1.3.8"
checksum: 10/ffbb24a01270139bb18886d235374110e35951a0e8b06b97b2a0ddd3b6d5fb68e696fdf18d444f1bc3a4db2fab418b354e077cdf6b36644e11ff08f069ad2b1c
"jsep@npm:^1.3.9":
version: 1.3.9
resolution: "jsep@npm:1.3.9"
checksum: 10/c60d7064c3b5047f58345e65e7618bbaecf2f46338e56689244db057b0550bf8fb7c1457a7384dfd38aca9acde3ff851d062c3f182cc1fbc66c13cb2ca0b579d
languageName: node
linkType: hard

Expand Down Expand Up @@ -23156,17 +23156,17 @@ __metadata:
languageName: node
linkType: hard

"jsonpath-plus@npm:^9.0.0":
version: 9.0.0
resolution: "jsonpath-plus@npm:9.0.0"
"jsonpath-plus@npm:~10.0.0":
version: 10.0.6
resolution: "jsonpath-plus@npm:10.0.6"
dependencies:
"@jsep-plugin/assignment": "npm:^1.2.1"
"@jsep-plugin/regex": "npm:^1.0.3"
jsep: "npm:^1.3.8"
jsep: "npm:^1.3.9"
bin:
jsonpath: bin/jsonpath-cli.js
jsonpath-plus: bin/jsonpath-cli.js
checksum: 10/a7b8099e92a8d11896857e55c48ce898180b6b2fa6a1db819dcdacf9741ae03a8b4263ae844b40d6a8e171c2d54e37d8ee3d206777e90ee0127246bae2102ee5
checksum: 10/1d57988878f095d2fdc6efdbdfb612472c4961882a8e1dc3333e540880689be823cf7fc6fcdd36311c246adf96293796cf2d5992eff3ce82044a39ceb74abea6
languageName: node
linkType: hard

Expand Down

0 comments on commit 98b421e

Please sign in to comment.