From 307e8183d1a315306d2ec692175621a2da4639dc Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 21 May 2025 15:33:45 +0200 Subject: [PATCH 1/9] Improve bug report template --- .github/ISSUE_TEMPLATE/bug_report.yml | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index a61d834..033bcdb 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -33,6 +33,15 @@ body: validations: required: true + - type: textarea + id: description + attributes: + label: Description of the problem + description: | + Describe as exactly as possible what is not working. + validations: + required: true + - type: textarea id: steps-to-reproduce attributes: @@ -47,20 +56,6 @@ body: validations: required: true - - type: textarea - id: expected-behavior - attributes: - label: Expected behavior - description: | - Tell us what you expect to happen. - - - type: textarea - id: actual-behavior - attributes: - label: Actual behavior - description: | - Tell us what happens with the steps given above. - - type: textarea id: additional-information attributes: From 0f72ad300d4e3d5e96789ad1ea4cedbd4615a863 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 22 May 2025 04:16:33 +0000 Subject: [PATCH 2/9] Update dependency com.puppycrawl.tools:checkstyle to v10.24.0 --- pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d386c6f..2f769c6 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.puppycrawl.tools checkstyle - 10.23.1 + 10.24.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 5a67e47..05eb480 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -209,7 +209,7 @@ com.puppycrawl.tools checkstyle - 10.23.1 + 10.24.0 From 1f43f30a62b22cd9b82e681ecb599864743b5d89 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 26 May 2025 04:18:21 +0000 Subject: [PATCH 3/9] Update dependency software.xdev:testcontainers-junit4-mock to v1.0.2 --- testcontainers-selenium/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcontainers-selenium/pom.xml b/testcontainers-selenium/pom.xml index eae85ad..a2019b0 100644 --- a/testcontainers-selenium/pom.xml +++ b/testcontainers-selenium/pom.xml @@ -68,7 +68,7 @@ software.xdev testcontainers-junit4-mock - 1.0.1 + 1.0.2 From 678152ee23be842f27a33e6af072b638cb9c548e Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 26 May 2025 04:18:22 +0000 Subject: [PATCH 4/9] Update org.seleniumhq.selenium to v4.33.0 --- testcontainers-selenium-demo/pom.xml | 2 +- testcontainers-selenium/pom.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testcontainers-selenium-demo/pom.xml b/testcontainers-selenium-demo/pom.xml index c5d5f0e..2e494fb 100644 --- a/testcontainers-selenium-demo/pom.xml +++ b/testcontainers-selenium-demo/pom.xml @@ -34,7 +34,7 @@ org.seleniumhq.selenium selenium-dependencies-bom - 4.32.0 + 4.33.0 pom import diff --git a/testcontainers-selenium/pom.xml b/testcontainers-selenium/pom.xml index eae85ad..4c918d7 100644 --- a/testcontainers-selenium/pom.xml +++ b/testcontainers-selenium/pom.xml @@ -82,7 +82,7 @@ org.seleniumhq.selenium selenium-api - 4.32.0 + 4.33.0 provided @@ -102,7 +102,7 @@ org.seleniumhq.selenium selenium-remote-driver - 4.32.0 + 4.33.0 test @@ -120,13 +120,13 @@ org.seleniumhq.selenium selenium-support - 4.32.0 + 4.33.0 test org.seleniumhq.selenium selenium-firefox-driver - 4.32.0 + 4.33.0 test @@ -139,7 +139,7 @@ org.seleniumhq.selenium selenium-chrome-driver - 4.32.0 + 4.33.0 test From 4be4a2739784730fa044b3d5ca80743eb654dd83 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Fri, 30 May 2025 04:14:46 +0000 Subject: [PATCH 5/9] Update dependency org.testcontainers:testcontainers to v1.21.1 --- testcontainers-selenium/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcontainers-selenium/pom.xml b/testcontainers-selenium/pom.xml index eae85ad..f42e5bc 100644 --- a/testcontainers-selenium/pom.xml +++ b/testcontainers-selenium/pom.xml @@ -56,7 +56,7 @@ org.testcontainers testcontainers - 1.21.0 + 1.21.1 From 709995c578523840db6df7ee79795e2f017b346f Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 31 May 2025 04:14:57 +0000 Subject: [PATCH 6/9] Update net.sourceforge.pmd to v7.14.0 --- pom.xml | 4 ++-- template-placeholder/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 2f769c6..5bffd11 100644 --- a/pom.xml +++ b/pom.xml @@ -82,12 +82,12 @@ net.sourceforge.pmd pmd-core - 7.13.0 + 7.14.0 net.sourceforge.pmd pmd-java - 7.13.0 + 7.14.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 05eb480..83ac028 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -246,12 +246,12 @@ net.sourceforge.pmd pmd-core - 7.13.0 + 7.14.0 net.sourceforge.pmd pmd-java - 7.13.0 + 7.14.0 From 0e709cb9bfc10580e93a05bcc983158d61981148 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 31 May 2025 04:15:33 +0000 Subject: [PATCH 7/9] Update dependency org.junit.jupiter:junit-jupiter to v5.13.0 --- testcontainers-selenium/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcontainers-selenium/pom.xml b/testcontainers-selenium/pom.xml index eae85ad..ca96740 100644 --- a/testcontainers-selenium/pom.xml +++ b/testcontainers-selenium/pom.xml @@ -90,7 +90,7 @@ org.junit.jupiter junit-jupiter - 5.12.2 + 5.13.0 test From 4a35b838f7be1dbe648a1bda16b1b3945ebb3285 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sun, 1 Jun 2025 04:24:06 +0000 Subject: [PATCH 8/9] Update dependency com.puppycrawl.tools:checkstyle to v10.25.0 --- pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2f769c6..9552734 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.puppycrawl.tools checkstyle - 10.24.0 + 10.25.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 05eb480..951e302 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -209,7 +209,7 @@ com.puppycrawl.tools checkstyle - 10.24.0 + 10.25.0 From 242b37a93413a48f9206ca2708a0d047b22f607d Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 2 Jun 2025 15:18:04 +0200 Subject: [PATCH 9/9] Improve SHM configuration --- CHANGELOG.md | 3 +++ .../browser/BrowserWebDriverContainer.java | 26 +++++++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 547b515..50c843a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 1.2.2 +* [Browser] Improve SHM configuration + # 1.2.1 * Migrated deployment to _Sonatype Maven Central Portal_ [#155](https://github.com/xdev-software/standard-maven-template/issues/155) * Updated dependencies diff --git a/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/BrowserWebDriverContainer.java b/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/BrowserWebDriverContainer.java index 6cd67a9..9d59c06 100644 --- a/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/BrowserWebDriverContainer.java +++ b/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/BrowserWebDriverContainer.java @@ -89,6 +89,8 @@ public class BrowserWebDriverContainer osName.startsWith("Windows")) - .orElse(false)) + if(this.shouldDirectMountShm()) { - this.withSharedMemorySize(512 * FileUtils.ONE_MB); + this.getBinds().add(new Bind("/dev/shm", new Volume("/dev/shm"), AccessMode.rw)); } else { - this.getBinds().add(new Bind("/dev/shm", new Volume("/dev/shm"), AccessMode.rw)); + this.withSharedMemorySize(512 * FileUtils.ONE_MB); } } } + protected boolean shouldDirectMountShm() + { + return !isCurrentOsWindows(); + } + + protected static boolean isCurrentOsWindows() + { + if(currentOsWindows == null) + { + currentOsWindows = Optional.ofNullable(System.getProperty("os.name")) + .map(osName -> osName.startsWith("Windows")) + .orElse(false); + } + return !currentOsWindows; + } + protected void configureVNC() { if(this.disableVNC)