Skip to content

Commit be76be1

Browse files
AB-xdevAB-xdev
authored
Merge pull request #70 from xdev-software/develop
Release
2 parents 08e568c + 6098d65 commit be76be1

File tree

8 files changed

+57
-29
lines changed

8 files changed

+57
-29
lines changed

‎.github/workflows/broken-links.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
- name: Link Checker
2020
id: lychee
21-
uses: lycheeverse/lychee-action@v1
21+
uses: lycheeverse/lychee-action@v2
2222

2323
- name: Find already existing issue
2424
id: find-issue

‎.github/workflows/sonar.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
- '.idea/**'
1212
- 'assets/**'
1313
pull_request:
14-
types: [opened, synchronize, reopened]
14+
branches: [ develop ]
1515
paths-ignore:
1616
- '**.md'
1717
- '.config/**'

‎CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# 1.1.0
2+
* Make it easier to use different Selenium images
3+
* Update default Selenium version to ``4.25.0``
4+
* Updated dependencies
5+
16
# 1.0.2
27
* Updated dependencies
38

‎pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev</groupId>
88
<artifactId>testcontainers-selenium-root</artifactId>
9-
<version>1.0.3-SNAPSHOT</version>
9+
<version>1.1.0-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

1212
<organization>
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>com.puppycrawl.tools</groupId>
4747
<artifactId>checkstyle</artifactId>
48-
<version>10.18.0</version>
48+
<version>10.18.2</version>
4949
</dependency>
5050
</dependencies>
5151
<configuration>
@@ -82,12 +82,12 @@
8282
<dependency>
8383
<groupId>net.sourceforge.pmd</groupId>
8484
<artifactId>pmd-core</artifactId>
85-
<version>7.4.0</version>
85+
<version>7.6.0</version>
8686
</dependency>
8787
<dependency>
8888
<groupId>net.sourceforge.pmd</groupId>
8989
<artifactId>pmd-java</artifactId>
90-
<version>7.4.0</version>
90+
<version>7.6.0</version>
9191
</dependency>
9292
</dependencies>
9393
</plugin>

‎testcontainers-selenium-demo/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>software.xdev</groupId>
99
<artifactId>testcontainers-selenium-root</artifactId>
10-
<version>1.0.3-SNAPSHOT</version>
10+
<version>1.1.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>testcontainers-selenium-demo</artifactId>
14-
<version>1.0.3-SNAPSHOT</version>
14+
<version>1.1.0-SNAPSHOT</version>
1515
<packaging>jar</packaging>
1616

1717
<organization>
@@ -34,7 +34,7 @@
3434
<dependency>
3535
<groupId>org.seleniumhq.selenium</groupId>
3636
<artifactId>selenium-dependencies-bom</artifactId>
37-
<version>4.24.0</version>
37+
<version>4.25.0</version>
3838
<type>pom</type>
3939
<scope>import</scope>
4040
</dependency>

‎testcontainers-selenium/pom.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev</groupId>
88
<artifactId>testcontainers-selenium</artifactId>
9-
<version>1.0.3-SNAPSHOT</version>
9+
<version>1.1.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>testcontainers-selenium</name>
@@ -91,7 +91,7 @@
9191
<dependency>
9292
<groupId>org.testcontainers</groupId>
9393
<artifactId>testcontainers</artifactId>
94-
<version>1.20.1</version>
94+
<version>1.20.3</version>
9595
</dependency>
9696
<!-- Testcontainers is using outdated v1 -->
9797
<dependency>
@@ -104,15 +104,15 @@
104104
<dependency>
105105
<groupId>org.seleniumhq.selenium</groupId>
106106
<artifactId>selenium-api</artifactId>
107-
<version>4.24.0</version>
107+
<version>4.25.0</version>
108108
<scope>provided</scope>
109109
</dependency>
110110

111111
<!-- Tests -->
112112
<dependency>
113113
<groupId>org.junit.jupiter</groupId>
114114
<artifactId>junit-jupiter</artifactId>
115-
<version>5.11.0</version>
115+
<version>5.11.3</version>
116116
<scope>test</scope>
117117
</dependency>
118118
<dependency>
@@ -124,7 +124,7 @@
124124
<dependency>
125125
<groupId>org.seleniumhq.selenium</groupId>
126126
<artifactId>selenium-remote-driver</artifactId>
127-
<version>4.24.0</version>
127+
<version>4.25.0</version>
128128
<scope>test</scope>
129129
<exclusions>
130130
<!-- Tracing is not needed -->
@@ -142,13 +142,13 @@
142142
<dependency>
143143
<groupId>org.seleniumhq.selenium</groupId>
144144
<artifactId>selenium-support</artifactId>
145-
<version>4.24.0</version>
145+
<version>4.25.0</version>
146146
<scope>test</scope>
147147
</dependency>
148148
<dependency>
149149
<groupId>org.seleniumhq.selenium</groupId>
150150
<artifactId>selenium-firefox-driver</artifactId>
151-
<version>4.24.0</version>
151+
<version>4.25.0</version>
152152
<scope>test</scope>
153153
<exclusions>
154154
<!-- No unused, beta-grade, RUST blobs -->
@@ -161,7 +161,7 @@
161161
<dependency>
162162
<groupId>org.seleniumhq.selenium</groupId>
163163
<artifactId>selenium-chrome-driver</artifactId>
164-
<version>4.24.0</version>
164+
<version>4.25.0</version>
165165
<scope>test</scope>
166166
<exclusions>
167167
<!-- No unused, beta-grade, RUST blobs -->
@@ -184,15 +184,15 @@
184184
<plugin>
185185
<groupId>org.apache.maven.plugins</groupId>
186186
<artifactId>maven-project-info-reports-plugin</artifactId>
187-
<version>3.7.0</version>
187+
<version>3.8.0</version>
188188
</plugin>
189189
</plugins>
190190
</pluginManagement>
191191
<plugins>
192192
<plugin>
193193
<groupId>com.mycila</groupId>
194194
<artifactId>license-maven-plugin</artifactId>
195-
<version>4.5</version>
195+
<version>4.6</version>
196196
<configuration>
197197
<properties>
198198
<email>${project.organization.url}</email>
@@ -232,7 +232,7 @@
232232
<plugin>
233233
<groupId>org.apache.maven.plugins</groupId>
234234
<artifactId>maven-javadoc-plugin</artifactId>
235-
<version>3.10.0</version>
235+
<version>3.10.1</version>
236236
<executions>
237237
<execution>
238238
<id>attach-javadocs</id>
@@ -265,7 +265,7 @@
265265
<plugin>
266266
<groupId>org.apache.maven.plugins</groupId>
267267
<artifactId>maven-surefire-plugin</artifactId>
268-
<version>3.5.0</version>
268+
<version>3.5.1</version>
269269
<configuration>
270270
<skipTests>${skipTests}</skipTests>
271271
</configuration>
@@ -303,7 +303,7 @@
303303
<plugin>
304304
<groupId>org.apache.maven.plugins</groupId>
305305
<artifactId>maven-gpg-plugin</artifactId>
306-
<version>3.2.5</version>
306+
<version>3.2.7</version>
307307
<executions>
308308
<execution>
309309
<id>sign-artifacts</id>
@@ -351,7 +351,7 @@
351351
<dependency>
352352
<groupId>com.puppycrawl.tools</groupId>
353353
<artifactId>checkstyle</artifactId>
354-
<version>10.18.0</version>
354+
<version>10.18.2</version>
355355
</dependency>
356356
</dependencies>
357357
<configuration>
@@ -388,12 +388,12 @@
388388
<dependency>
389389
<groupId>net.sourceforge.pmd</groupId>
390390
<artifactId>pmd-core</artifactId>
391-
<version>7.4.0</version>
391+
<version>7.6.0</version>
392392
</dependency>
393393
<dependency>
394394
<groupId>net.sourceforge.pmd</groupId>
395395
<artifactId>pmd-java</artifactId>
396-
<version>7.4.0</version>
396+
<version>7.6.0</version>
397397
</dependency>
398398
</dependencies>
399399
</plugin>

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

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,38 @@ public class CapabilitiesBrowserWebDriverContainer<SELF extends CapabilitiesBrow
3737

3838
public CapabilitiesBrowserWebDriverContainer(final Capabilities capabilities)
3939
{
40-
super(getStandardImageForCapabilities(capabilities, SeleniumUtils.getClasspathSeleniumVersion()));
40+
this(capabilities, BROWSER_DOCKER_IMAGES);
41+
}
42+
43+
public CapabilitiesBrowserWebDriverContainer(
44+
final Capabilities capabilities,
45+
final Map<String, DockerImageName> browserDockerImages)
46+
{
47+
this(getStandardImageForCapabilities(
48+
capabilities,
49+
SeleniumUtils.getClasspathSeleniumVersion(),
50+
browserDockerImages));
51+
}
52+
53+
public CapabilitiesBrowserWebDriverContainer(final DockerImageName dockerImageName)
54+
{
55+
super(dockerImageName);
4156
this.waitStrategy = this.getDefaultWaitStrategy();
4257
}
4358

4459
protected static DockerImageName getStandardImageForCapabilities(
4560
final Capabilities capabilities,
4661
final String seleniumVersion)
4762
{
48-
return Optional.ofNullable(BROWSER_DOCKER_IMAGES.get(Optional.ofNullable(capabilities)
63+
return getStandardImageForCapabilities(capabilities, seleniumVersion, BROWSER_DOCKER_IMAGES);
64+
}
65+
66+
protected static DockerImageName getStandardImageForCapabilities(
67+
final Capabilities capabilities,
68+
final String seleniumVersion,
69+
final Map<String, DockerImageName> browserDockerImages)
70+
{
71+
return Optional.ofNullable(browserDockerImages.get(Optional.ofNullable(capabilities)
4972
.map(Capabilities::getBrowserName)
5073
.orElse(BrowserType.CHROME)))
5174
.map(image -> image.withTag(seleniumVersion))

‎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-04
41-
public static final String DEFAULT_SELENIUM_VERSION = "4.19.1";
40+
// as of 2024-10
41+
public static final String DEFAULT_SELENIUM_VERSION = "4.25.0";
4242
private static String cachedVersion;
4343

4444
private SeleniumUtils()

0 commit comments

Comments
 (0)