Merge pull request #212 from xdev-software/develop

Release

Author: AB-xdev

.config/pmd/java/ruleset.xml

@@ -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.

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.3.0
+* Update to Testcontainers v2
+
 # 1.2.5
 * Update default Selenium version to `4.36.0`
 * Updated dependencies

pom.xml

@@ -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>
@@ -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>
@@ -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>

testcontainers-selenium-demo/pom.xml

@@ -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>

testcontainers-selenium/pom.xml

@@ -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>
@@ -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 -->
@@ -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>
@@ -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>

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

@@ -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;
@@ -301,7 +300,7 @@ protected void configureShm()
 			}
 			else
 			{
-				this.withSharedMemorySize(512 * FileUtils.ONE_MB);
+				this.withSharedMemorySize(520_000_000L);
 			}
 		}
 	}