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 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 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 }} 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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 50c843a..2fe2839 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 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/pom.xml b/pom.xml index ea65490..e2af5fd 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ true true - .config/pmd/ruleset.xml + .config/pmd/java/ruleset.xml diff --git a/testcontainers-selenium/pom.xml b/testcontainers-selenium/pom.xml index bc1804c..a1569e1 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 @@ -356,7 +356,7 @@ true true - ../.config/pmd/ruleset.xml + ../.config/pmd/java/ruleset.xml 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..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 @@ -73,9 +73,12 @@ 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"); protected static final Map 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"; 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()