Skip to content

Commit b93a60d

Browse files
authored
Merge pull request #152 from xdev-software/develop
Release
2 parents ab64f12 + 478e1c5 commit b93a60d

File tree

10 files changed

+19
-12
lines changed

10 files changed

+19
-12
lines changed
File renamed without changes.

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
# Force MVN Wrapper Linux files LF
88
mvnw text eol=lf
9-
.mvn/wrapper/maven-wrapper.properties text eol=lf
9+
maven-wrapper.properties text eol=lf

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
9090
- name: Create Release
9191
id: create_release
92-
uses: shogo82148/actions-create-release@e5f206451d4ace2da9916d01f1aef279997f8659 # v1
92+
uses: shogo82148/actions-create-release@4661dc54f7b4b564074e9fbf73884d960de569a3 # v1
9393
with:
9494
tag_name: v${{ steps.version.outputs.release }}
9595
release_name: v${{ steps.version.outputs.release }}

.mvn/wrapper/maven-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.10/apache-maven-3.9.10-bin.zip

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 1.2.3
2+
* Make some constants externally accessible
3+
* Provide chromium image (Chrome doesn't work on ARM64)
4+
15
# 1.2.2
26
* [Browser] Improve SHM configuration
37

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<includeTests>true</includeTests>
7676
<printFailingErrors>true</printFailingErrors>
7777
<rulesets>
78-
<ruleset>.config/pmd/ruleset.xml</ruleset>
78+
<ruleset>.config/pmd/java/ruleset.xml</ruleset>
7979
</rulesets>
8080
</configuration>
8181
<dependencies>

testcontainers-selenium/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<dependency>
9191
<groupId>org.junit.jupiter</groupId>
9292
<artifactId>junit-jupiter</artifactId>
93-
<version>5.13.0</version>
93+
<version>5.13.1</version>
9494
<scope>test</scope>
9595
</dependency>
9696
<dependency>
@@ -356,7 +356,7 @@
356356
<includeTests>true</includeTests>
357357
<printFailingErrors>true</printFailingErrors>
358358
<rulesets>
359-
<ruleset>../.config/pmd/ruleset.xml</ruleset>
359+
<ruleset>../.config/pmd/java/ruleset.xml</ruleset>
360360
</rulesets>
361361
</configuration>
362362
<dependencies>

testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/BrowserWebDriverContainer.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,12 @@ public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SE
7373
{
7474
protected static final Logger LOG = LoggerFactory.getLogger(BrowserWebDriverContainer.class);
7575

76-
protected static final DockerImageName CHROME_IMAGE = DockerImageName.parse("selenium/standalone-chrome");
77-
protected static final DockerImageName FIREFOX_IMAGE = DockerImageName.parse("selenium/standalone-firefox");
78-
protected static final DockerImageName EDGE_IMAGE = DockerImageName.parse("selenium/standalone-edge");
76+
public static final DockerImageName CHROME_IMAGE = DockerImageName.parse("selenium/standalone-chrome");
77+
// NOTE: Chrome has no ARM64 image (Why Google?) -> Provide option to use Chromium instead
78+
// https://github.com/SeleniumHQ/docker-selenium/discussions/2379
79+
public static final DockerImageName CHROMIUM_IMAGE = DockerImageName.parse("selenium/standalone-chromium");
80+
public static final DockerImageName FIREFOX_IMAGE = DockerImageName.parse("selenium/standalone-firefox");
81+
public static final DockerImageName EDGE_IMAGE = DockerImageName.parse("selenium/standalone-edge");
7982

8083
protected static final Map<DockerImageName, String> WORKING_BROWSER_IMAGES_TRANSLATION =
8184
Collections.synchronizedMap(new HashMap<>());

testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/CapabilitiesBrowserWebDriverContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ protected static DockerImageName getStandardImageForCapabilities(
7777
));
7878
}
7979

80-
protected static final class BrowserType
80+
public static final class BrowserType
8181
{
8282
public static final String CHROME = "chrome";
8383
public static final String FIREFOX = "firefox";

testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/SeleniumUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ public final class SeleniumUtils
3737
{
3838
private static final Logger LOG = LoggerFactory.getLogger(SeleniumUtils.class);
3939

40-
// as of 2024-11
41-
public static final String DEFAULT_SELENIUM_VERSION = "4.26.0";
40+
// as of 2025-06
41+
public static final String DEFAULT_SELENIUM_VERSION = "4.33.0";
4242
private static String cachedVersion;
4343

4444
private SeleniumUtils()

0 commit comments

Comments
 (0)