From 7b2210a0e9a044fd194eeaac4761353c3b2fc357 Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 3 Jun 2025 08:37:03 +0200 Subject: [PATCH 01/10] Move PMD to java subfolder https://github.com/xdev-software/java-template/issues/19 --- .config/pmd/{ => java}/ruleset.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .config/pmd/{ => java}/ruleset.xml (100%) diff --git a/.config/pmd/ruleset.xml b/.config/pmd/java/ruleset.xml similarity index 100% rename from .config/pmd/ruleset.xml rename to .config/pmd/java/ruleset.xml From 9c3732adbeca22563a07683980761b404d60760c Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 3 Jun 2025 08:38:27 +0200 Subject: [PATCH 02/10] Update pmd location https://github.com/xdev-software/java-template/issues/19 --- template-placeholder/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index f6ad276..98aae88 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -239,7 +239,7 @@ true true - ../.config/pmd/ruleset.xml + ../.config/pmd/java/ruleset.xml From ff7d9184c194012c44fd7c2819b8ec1d8fa7e1fd Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 5 Jun 2025 09:52:46 +0200 Subject: [PATCH 03/10] Fix maven wrapper not working correctly on Windows Docker in non root (/) Properties files in subdirectory e.g. /submodule/.mvn/wrapper/maven-wrapper.properties is not formatted correctly! --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 9c74e42..8ac8027 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,4 +6,4 @@ # Force MVN Wrapper Linux files LF mvnw text eol=lf -.mvn/wrapper/maven-wrapper.properties text eol=lf +maven-wrapper.properties text eol=lf From c5ee7c773b9c2feff77cbb57185664d3e0596263 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Fri, 6 Jun 2025 04:20:27 +0000 Subject: [PATCH 04/10] Update dependency maven to v3.9.10 --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 4d624fa..3112b8e 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.10/apache-maven-3.9.10-bin.zip From cd8f672965dced746f647393b10e488764165bdf Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Fri, 6 Jun 2025 11:05:26 +0200 Subject: [PATCH 05/10] Update default Selenium version --- .../selenium/containers/browser/SeleniumUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/SeleniumUtils.java b/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/SeleniumUtils.java index 60d8909..890181a 100644 --- a/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/SeleniumUtils.java +++ b/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/SeleniumUtils.java @@ -37,8 +37,8 @@ public final class SeleniumUtils { private static final Logger LOG = LoggerFactory.getLogger(SeleniumUtils.class); - // as of 2024-11 - public static final String DEFAULT_SELENIUM_VERSION = "4.26.0"; + // as of 2025-06 + public static final String DEFAULT_SELENIUM_VERSION = "4.33.0"; private static String cachedVersion; private SeleniumUtils() From 46f719b1099f85e22ad13607a83dad42a0982b48 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sun, 8 Jun 2025 04:19:18 +0000 Subject: [PATCH 06/10] Update dependency org.junit.jupiter:junit-jupiter to v5.13.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 bc1804c..077d189 100644 --- a/testcontainers-selenium/pom.xml +++ b/testcontainers-selenium/pom.xml @@ -90,7 +90,7 @@ org.junit.jupiter junit-jupiter - 5.13.0 + 5.13.1 test From 1038c7877757adbe9d59c35fed4d93faabbbbd09 Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 10 Jun 2025 09:37:48 +0200 Subject: [PATCH 07/10] Correct pmd ruleset location --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 10a6321..a0d8268 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ true true - .config/pmd/ruleset.xml + .config/pmd/java/ruleset.xml From a830f314468281d45b85a281d01428db6393cf5b Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 12 Jun 2025 04:17:46 +0000 Subject: [PATCH 08/10] Update shogo82148/actions-create-release digest to 4661dc5 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2cb3393..2e93568 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -89,7 +89,7 @@ jobs: - name: Create Release id: create_release - uses: shogo82148/actions-create-release@e5f206451d4ace2da9916d01f1aef279997f8659 # v1 + uses: shogo82148/actions-create-release@4661dc54f7b4b564074e9fbf73884d960de569a3 # v1 with: tag_name: v${{ steps.version.outputs.release }} release_name: v${{ steps.version.outputs.release }} From f13719da11ed20eab87dfff3158f0ebd05a2eb3c Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 13 Jun 2025 09:11:10 +0200 Subject: [PATCH 09/10] Make some constants externally accessible --- CHANGELOG.md | 3 +++ .../containers/browser/BrowserWebDriverContainer.java | 6 +++--- .../browser/CapabilitiesBrowserWebDriverContainer.java | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50c843a..258eff0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 1.2.3 +* Make some constants externally accessible + # 1.2.2 * [Browser] Improve SHM configuration 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 9d59c06..3a0557b 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 @@ -73,9 +73,9 @@ public class BrowserWebDriverContainer WORKING_BROWSER_IMAGES_TRANSLATION = Collections.synchronizedMap(new HashMap<>()); diff --git a/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/CapabilitiesBrowserWebDriverContainer.java b/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/CapabilitiesBrowserWebDriverContainer.java index c57f56f..5d75c29 100644 --- a/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/CapabilitiesBrowserWebDriverContainer.java +++ b/testcontainers-selenium/src/main/java/software/xdev/testcontainers/selenium/containers/browser/CapabilitiesBrowserWebDriverContainer.java @@ -77,7 +77,7 @@ protected static DockerImageName getStandardImageForCapabilities( )); } - protected static final class BrowserType + public static final class BrowserType { public static final String CHROME = "chrome"; public static final String FIREFOX = "firefox"; From 478e1c50341659edff9909f61af9f381aae478cc Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 13 Jun 2025 09:16:19 +0200 Subject: [PATCH 10/10] Provide chromium image --- CHANGELOG.md | 1 + .../selenium/containers/browser/BrowserWebDriverContainer.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 258eff0..2fe2839 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # 1.2.3 * Make some constants externally accessible +* Provide chromium image (Chrome doesn't work on ARM64) # 1.2.2 * [Browser] Improve SHM configuration 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 3a0557b..465a699 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 @@ -74,6 +74,9 @@ public class BrowserWebDriverContainer Provide option to use Chromium instead + // https://github.com/SeleniumHQ/docker-selenium/discussions/2379 + public static final DockerImageName CHROMIUM_IMAGE = DockerImageName.parse("selenium/standalone-chromium"); public static final DockerImageName FIREFOX_IMAGE = DockerImageName.parse("selenium/standalone-firefox"); public static final DockerImageName EDGE_IMAGE = DockerImageName.parse("selenium/standalone-edge");