Update to Testcontainers v2

Author: AB-xdev

testcontainers-advanced-imagebuilder/pom.xml

@@ -57,18 +57,6 @@
 			<groupId>org.testcontainers</groupId>
 			<artifactId>testcontainers</artifactId>
 			<version>2.0.0</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>
 		</dependency>
 		<!-- Testcontainers is using outdated v1 -->
 		<dependency>
@@ -77,6 +65,14 @@
 			<version>2.0.17</version>
 		</dependency>
 
+		<!-- Explicitly declared to prevent incompatibilities -->
+		<!-- Original comes transitively from Testcontainers -->
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.20.0</version>
+		</dependency>
+
 		<!-- Tests -->
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>

testcontainers-advanced-imagebuilder/src/main/java/software/xdev/testcontainers/imagebuilder/AdvancedImageFromDockerFile.java

@@ -43,6 +43,8 @@
 import java.util.zip.GZIPOutputStream;
 
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.function.TriFunction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.DockerClientFactory;
@@ -53,8 +55,6 @@
 import org.testcontainers.images.builder.traits.DockerfileTrait;
 import org.testcontainers.images.builder.traits.FilesTrait;
 import org.testcontainers.images.builder.traits.StringsTrait;
-import org.testcontainers.shaded.org.apache.commons.io.FileUtils;
-import org.testcontainers.shaded.org.apache.commons.lang3.function.TriFunction;
 import org.testcontainers.utility.Base58;
 import org.testcontainers.utility.DockerImageName;
 import org.testcontainers.utility.DockerLoggerFactory;

testcontainers-advanced-imagebuilder/src/main/java/software/xdev/testcontainers/imagebuilder/transfer/DefaultTransferFilesCreator.java

@@ -39,10 +39,10 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testcontainers.shaded.org.apache.commons.io.FileUtils;
-import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
 
 import software.xdev.testcontainers.imagebuilder.jgit.ignore.FastIgnoreRule;
 import software.xdev.testcontainers.imagebuilder.jgit.ignore.IgnoreNode;
@@ -177,7 +177,7 @@ protected static Stream<Path> findFiles(
 			: Files.find(start, maxDepth, matcher, options);
 	}
 
-	@SuppressWarnings("java:S2789")
+	@SuppressWarnings({"java:S2789", "OptionalAssignedToNull"})
 	protected Map.Entry<Path, String> determineFileForTransfer(
 		final IgnoreNode ignoreNode,
 		final Set<String> alwaysIncludedRelativePaths,
@@ -213,7 +213,7 @@ protected Map.Entry<Path, String> determineFileForTransfer(
 		return outcomeDirs;
 	}
 
-	@SuppressWarnings("java:S2789")
+	@SuppressWarnings({"java:S2789", "OptionalAssignedToNull"})
 	protected Map.Entry<Path, String> determineParentDirectoryForTransfer(
 		final IgnoreNode ignoreNode,
 		final Set<String> alwaysIncludedRelativePaths,
@@ -261,7 +261,7 @@ protected String parentDirectory(final String dir)
 			: null;
 	}
 
-	@SuppressWarnings("java:S2789")
+	@SuppressWarnings({"java:S2789", "OptionalAssignedToNull"})
 	protected Optional<Map.Entry<Path, String>> shouldIgnore(
 		final IgnoreNode ignoreNode,
 		final Set<String> alwaysIncludedRelativePaths,

testcontainers-advanced-imagebuilder/src/main/java/software/xdev/testcontainers/imagebuilder/transfer/TransferArchiveTARCompressor.java

@@ -30,8 +30,8 @@
 
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
-import org.testcontainers.shaded.org.apache.commons.io.FileUtils;
-import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
 
 import software.xdev.testcontainers.imagebuilder.transfer.fcm.FileContentModifier;