Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dependabot/maven/or…
Browse files Browse the repository at this point in the history
…g.springdoc-springdoc-openapi-starter-webmvc-ui-2.7.0
  • Loading branch information
jesperancinha committed Dec 22, 2024
2 parents 21ba0d7 + 6965324 commit 468e452
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 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.16.1"
image: "cypress/included:13.17.0"
working_dir: /e2e
command: "--browser electron --config defaultCommandTimeout=15000,requestTimeout=15000"
volumes:
Expand All @@ -10,7 +10,7 @@ services:
- bl-net

e2e-chrome:
image: "cypress/included:13.16.1"
image: "cypress/included:13.17.0"
working_dir: /e2e
command: "--browser chrome --config defaultCommandTimeout=15000,requestTimeout=15000"
volumes:
Expand All @@ -19,7 +19,7 @@ services:
- bl-net

e2e-firefox:
image: "cypress/included:13.16.1"
image: "cypress/included:13.17.0"
working_dir: /e2e
command: "--browser firefox --config defaultCommandTimeout=15000,requestTimeout=15000"
volumes:
Expand All @@ -28,7 +28,7 @@ services:
- bl-net

e2e-firefox-full:
image: "cypress/included:13.16.1"
image: "cypress/included:13.17.0"
working_dir: /e2e
command: "--config-file /e2e/full.cypress.config.ts --browser firefox --config defaultCommandTimeout=15000,requestTimeout=15000"
volumes:
Expand All @@ -37,7 +37,7 @@ services:
- bl-net

e2e-edge:
image: "cypress/included:13.16.1"
image: "cypress/included:13.17.0"
working_dir: /e2e
command: "--browser edge --config defaultCommandTimeout=15000,requestTimeout=15000"
volumes:
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
<kotest.version>5.9.1</kotest.version>
<springmockk.version>4.0.2</springmockk.version>
<kotest-extensions-spring.version>1.3.0</kotest-extensions-spring.version>
<mockk.version>1.13.13</mockk.version>
<mockk.version>1.13.14</mockk.version>

<failOnMissingWebXml>false</failOnMissingWebXml>

Expand All @@ -173,7 +173,7 @@
<maven-assembly-plugin.version>3.5.0</maven-assembly-plugin.version>

<omni-coveragereporter-maven-plugin.version>0.4.4</omni-coveragereporter-maven-plugin.version>
<kotlinx-coroutines-debug.version>1.10.0</kotlinx-coroutines-debug.version>
<kotlinx-coroutines-debug.version>1.10.1</kotlinx-coroutines-debug.version>

<!-- Swagger -->
<springdoc-openapi-starter-webmvc-ui.version>2.7.0</springdoc-openapi-starter-webmvc-ui.version>
Expand Down
2 changes: 1 addition & 1 deletion pr.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
PR Accept on Sun Dec 15 21:25:11 CET 2024
PR Accept on Sun Dec 22 08:58:06 CET 2024

0 comments on commit 468e452

Please sign in to comment.