Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
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
2 changes: 1 addition & 1 deletion .config/pmd/java/ruleset.xml
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@

<rule name="AvoidStringBuilderOrBuffer"
language="java"
message="StringBuilder/ should not be used"
message="StringBuilder/StringBuffer should not be used"
class="net.sourceforge.pmd.lang.rule.xpath.XPathRule">
<description>
Usually all cases where `StringBuilder` (or the outdated `StringBuffer`) is used are either due to confusing (legacy) logic or may be replaced by a simpler string concatenation.
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.3.0
* Update to Testcontainers v2

# 1.2.5
* Update default Selenium version to `4.36.0`
* Updated dependencies
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>software.xdev</groupId>
<artifactId>testcontainers-selenium-root</artifactId>
<version>1.2.6-SNAPSHOT</version>
<version>1.3.0-SNAPSHOT</version>
<packaging>pom</packaging>

<organization>
Expand Down Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>11.1.0</version>
<version>12.0.1</version>
</dependency>
</dependencies>
<configuration>
Expand All @@ -70,7 +70,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.27.0</version>
<version>3.28.0</version>
<configuration>
<analysisCache>true</analysisCache>
<includeTests>true</includeTests>
Expand Down
4 changes: 2 additions & 2 deletions testcontainers-selenium-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<parent>
<groupId>software.xdev</groupId>
<artifactId>testcontainers-selenium-root</artifactId>
<version>1.2.6-SNAPSHOT</version>
<version>1.3.0-SNAPSHOT</version>
</parent>

<artifactId>testcontainers-selenium-demo</artifactId>
<version>1.2.6-SNAPSHOT</version>
<version>1.3.0-SNAPSHOT</version>
<packaging>jar</packaging>

<organization>
Expand Down
20 changes: 4 additions & 16 deletions testcontainers-selenium/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>software.xdev</groupId>
<artifactId>testcontainers-selenium</artifactId>
<version>1.2.6-SNAPSHOT</version>
<version>1.3.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>testcontainers-selenium</name>
Expand Down Expand Up @@ -56,19 +56,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>1.21.3</version>
<exclusions>
<!-- No JUnit 4 -->
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>software.xdev</groupId>
<artifactId>testcontainers-junit4-mock</artifactId>
<version>1.0.2</version>
<version>2.0.0</version>
</dependency>

<!-- Testcontainers is using outdated v1 -->
Expand Down Expand Up @@ -332,7 +320,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>11.1.0</version>
<version>12.0.1</version>
</dependency>
</dependencies>
<configuration>
Expand All @@ -357,7 +345,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.27.0</version>
<version>3.28.0</version>
<configuration>
<analysisCache>true</analysisCache>
<includeTests>true</includeTests>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
import org.testcontainers.images.RemoteDockerImage;
import org.testcontainers.lifecycle.TestDescription;
import org.testcontainers.lifecycle.TestLifecycleAware;
import org.testcontainers.shaded.org.apache.commons.io.FileUtils;
import org.testcontainers.utility.DockerImageName;

import com.github.dockerjava.api.command.InspectContainerResponse;
Expand Down Expand Up @@ -301,7 +300,7 @@ protected void configureShm()
}
else
{
this.withSharedMemorySize(512 * FileUtils.ONE_MB);
this.withSharedMemorySize(520_000_000L);
}
}
}
Expand Down