Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
4188810
Merge pull request #136 from xdev-software/master
AB-xdev May 20, 2025
307e818
Improve bug report template
AB-xdev May 21, 2025
4efdbac
Merge branch 'master' into update-from-template-merged
xdev-gh-bot May 22, 2025
2e6baf7
Merge branch 'master' into update-from-template-merged
xdev-gh-bot May 22, 2025
0f72ad3
Update dependency com.puppycrawl.tools:checkstyle to v10.24.0
xdev-renovate May 22, 2025
3967f51
Merge pull request #157 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev May 22, 2025
f2c3aef
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot May 26, 2025
1f43f30
Update dependency software.xdev:testcontainers-junit4-mock to v1.0.2
xdev-renovate May 26, 2025
678152e
Update org.seleniumhq.selenium to v4.33.0
xdev-renovate May 26, 2025
4be4a27
Update dependency org.testcontainers:testcontainers to v1.21.1
xdev-renovate May 30, 2025
709995c
Update net.sourceforge.pmd to v7.14.0
xdev-renovate May 31, 2025
0e709cb
Update dependency org.junit.jupiter:junit-jupiter to v5.13.0
xdev-renovate May 31, 2025
4a35b83
Update dependency com.puppycrawl.tools:checkstyle to v10.25.0
xdev-renovate Jun 1, 2025
ba44b1f
Merge pull request #158 from xdev-software/renovate/net.sourceforge.pmd
AB-xdev Jun 2, 2025
883fc4c
Merge pull request #159 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Jun 2, 2025
242b37a
Improve SHM configuration
AB-xdev Jun 2, 2025
5435522
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Jun 2, 2025
9b219e0
Merge pull request #139 from xdev-software/renovate/org.seleniumhq.se…
AB-xdev Jun 2, 2025
b07d41e
Merge pull request #137 from xdev-software/renovate/software.xdev-tes…
AB-xdev Jun 2, 2025
82979f7
Merge pull request #141 from xdev-software/renovate/org.testcontainer…
AB-xdev Jun 2, 2025
bd76a4b
Merge pull request #142 from xdev-software/renovate/org.junit.jupiter…
AB-xdev Jun 2, 2025
eeade51
Merge remote-tracking branch 'origin/update-from-template-merged' int…
xdev-gh-bot Jun 2, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 9 additions & 14 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.23.1</version>
<version>10.25.0</version>
</dependency>
</dependencies>
<configuration>
Expand Down Expand Up @@ -82,12 +82,12 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
<version>7.13.0</version>
<version>7.14.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
<version>7.13.0</version>
<version>7.14.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion testcontainers-selenium-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-dependencies-bom</artifactId>
<version>4.32.0</version>
<version>4.33.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
22 changes: 11 additions & 11 deletions testcontainers-selenium/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.21.0</version>
<version>1.21.1</version>
<exclusions>
<!-- No JUnit 4 -->
<exclusion>
Expand All @@ -68,7 +68,7 @@
<dependency>
<groupId>software.xdev</groupId>
<artifactId>testcontainers-junit4-mock</artifactId>
<version>1.0.1</version>
<version>1.0.2</version>
</dependency>

<!-- Testcontainers is using outdated v1 -->
Expand All @@ -82,15 +82,15 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-api</artifactId>
<version>4.32.0</version>
<version>4.33.0</version>
<scope>provided</scope>
</dependency>

<!-- Tests -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.12.2</version>
<version>5.13.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -102,7 +102,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-remote-driver</artifactId>
<version>4.32.0</version>
<version>4.33.0</version>
<scope>test</scope>
<exclusions>
<!-- Tracing is not needed -->
Expand All @@ -120,13 +120,13 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-support</artifactId>
<version>4.32.0</version>
<version>4.33.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-firefox-driver</artifactId>
<version>4.32.0</version>
<version>4.33.0</version>
<scope>test</scope>
<exclusions>
<!-- No unused, beta-grade, RUST blobs -->
Expand All @@ -139,7 +139,7 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-chrome-driver</artifactId>
<version>4.32.0</version>
<version>4.33.0</version>
<scope>test</scope>
<exclusions>
<!-- No unused, beta-grade, RUST blobs -->
Expand Down Expand Up @@ -326,7 +326,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.23.1</version>
<version>10.25.0</version>
</dependency>
</dependencies>
<configuration>
Expand Down Expand Up @@ -363,12 +363,12 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-core</artifactId>
<version>7.13.0</version>
<version>7.14.0</version>
</dependency>
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
<version>7.13.0</version>
<version>7.14.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SE

protected static final String TC_TEMP_DIR_PREFIX = "tc";

protected static Boolean currentOsWindows; // You should use the method instead, this might be NULL

protected boolean mapTimezoneIntoContainer = true;

protected boolean validateImageEnabled = true;
Expand Down Expand Up @@ -280,19 +282,33 @@ protected void configureShm()
{
if(this.getShmSize() == null)
{
if(Optional.ofNullable(System.getProperty("os.name"))
.map(osName -> 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)
Expand Down