Skip to content

Commit

Permalink
Merge branch 'main' of github.com:jesperancinha/from-paris-to-berlin-…
Browse files Browse the repository at this point in the history
…circuit-breaker
  • Loading branch information
jesperancinha committed Jul 29, 2024
2 parents 4aa1998 + 91c4b29 commit e4ed8d1
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 23 deletions.
10 changes: 5 additions & 5 deletions e2e/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.7'
services:
e2e-electron:
image: "cypress/included:13.13.0"
image: "cypress/included:13.13.1"
working_dir: /e2e
command: "--browser electron --config baseUrl=http://from-paris-to-berlin-fe:9000 --env port=9000"
volumes:
Expand All @@ -10,7 +10,7 @@ services:
- paris_to_berlin_net

e2e-chrome:
image: "cypress/included:13.13.0"
image: "cypress/included:13.13.1"
working_dir: /e2e
command: "--browser chrome --config baseUrl=http://from-paris-to-berlin-fe:9000 --env port=9000"
volumes:
Expand All @@ -19,7 +19,7 @@ services:
- paris_to_berlin_net

e2e-firefox:
image: "cypress/included:13.13.0"
image: "cypress/included:13.13.1"
working_dir: /e2e
command: "--browser firefox --config baseUrl=http://from-paris-to-berlin-fe:9000 --env port=9000"
volumes:
Expand All @@ -28,7 +28,7 @@ services:
- paris_to_berlin_net

e2e-firefox-full:
image: "cypress/included:13.13.0"
image: "cypress/included:13.13.1"
working_dir: /e2e
command: "--config-file full.cypress.config.ts --browser firefox --config baseUrl=http://from-paris-to-berlin-fe:9000 --env port=9000"
volumes:
Expand All @@ -37,7 +37,7 @@ services:
- paris_to_berlin_net

e2e-edge:
image: "cypress/included:13.13.0"
image: "cypress/included:13.13.1"
working_dir: /e2e
command: "--browser edge --config baseUrl=http://from-paris-to-berlin-fe:9000 --env port=9000"
volumes:
Expand Down
34 changes: 17 additions & 17 deletions from-paris-to-berlin-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~18.1.0",
"@angular/cdk": "^18.1.0",
"@angular/common": "~18.1.0",
"@angular/compiler": "~18.1.0",
"@angular/core": "~18.1.0",
"@angular/forms": "~18.1.0",
"@angular/material": "^18.1.0",
"@angular/platform-browser": "~18.1.0",
"@angular/platform-browser-dynamic": "~18.1.0",
"@angular/router": "~18.1.0",
"@angular/animations": "~18.1.1",
"@angular/cdk": "^18.1.1",
"@angular/common": "~18.1.1",
"@angular/compiler": "~18.1.1",
"@angular/core": "~18.1.1",
"@angular/forms": "~18.1.1",
"@angular/material": "^18.1.1",
"@angular/platform-browser": "~18.1.1",
"@angular/platform-browser-dynamic": "~18.1.1",
"@angular/router": "~18.1.1",
"@stomp/stompjs": "^7.0.0",
"build": "^0.1.4",
"gojs": "^3.0.7",
"gojs": "^3.0.8",
"gojs-angular": "^2.0.7",
"ng2-stomp-service": "^1.2.2",
"rxjs": "~7.8.1",
Expand All @@ -31,17 +31,17 @@
"test": "^3.3.0",
"tslib": "^2.6.3",
"typescript": "<5.6.0",
"zone.js": "~0.14.7"
"zone.js": "~0.14.8"
},
"devDependencies": {
"@angular-devkit/build-angular": "~18.1.0",
"@angular/cli": "~18.1.0",
"@angular/compiler-cli": "~18.1.0",
"@angular-devkit/build-angular": "~18.1.1",
"@angular/cli": "~18.1.1",
"@angular/compiler-cli": "~18.1.1",
"@types/jasmine": "~5.1.4",
"@types/node": "^20.14.10",
"@types/node": "^20.14.11",
"@types/sockjs-client": "^1.5.4",
"@types/stompjs": "^2.3.9",
"jasmine-core": "~5.1.2",
"jasmine-core": "~5.2.0",
"karma": "~6.4.3",
"karma-chrome-launcher": "~3.2.0",
"karma-coverage": "~2.2.1",
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<springdoc-openapi-starter-webmvc-ui.version>2.6.0</springdoc-openapi-starter-webmvc-ui.version>
<springdoc-openapi-starter-webflux-ui.version>2.6.0</springdoc-openapi-starter-webflux-ui.version>
<from-paris-to-berlin-data.version>1.0.0</from-paris-to-berlin-data.version>
<hazelcast.version>5.4.0</hazelcast.version>
<hazelcast.version>5.5.0</hazelcast.version>
</properties>

<modules>
Expand Down
1 change: 1 addition & 0 deletions pr.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
PR Accept on za 13 jul 2024 19:48:09 CEST
PR Accept on Sat Jul 13 19:48:49 CEST 2024
PR Accept on Sun Jul 14 11:08:25 CEST 2024
PR Accept on Sun Jul 21 11:00:36 CEST 2024
PR Accept on Sun Jul 28 19:25:43 CEST 2024

0 comments on commit e4ed8d1

Please sign in to comment.