Skip to content

Commit d000d12

Browse files
AB-xdevAB-xdev
authored
Merge pull request #196 from xdev-software/develop
Release
2 parents 377f3cc + 6fb2f38 commit d000d12

File tree

9 files changed

+33
-34
lines changed

9 files changed

+33
-34
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 2.4.0
2+
* Update to Testcontainers v2
3+
14
# 2.3.0
25
* Use Virtual Threads on Java 21+
36
* Minor optimizations

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev</groupId>
88
<artifactId>testcontainers-advanced-imagebuilder-root</artifactId>
9-
<version>2.3.1-SNAPSHOT</version>
9+
<version>2.4.0-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

1212
<organization>
@@ -46,7 +46,7 @@
4646
<dependency>
4747
<groupId>com.puppycrawl.tools</groupId>
4848
<artifactId>checkstyle</artifactId>
49-
<version>11.1.0</version>
49+
<version>12.0.1</version>
5050
</dependency>
5151
</dependencies>
5252
<configuration>
@@ -71,7 +71,7 @@
7171
<plugin>
7272
<groupId>org.apache.maven.plugins</groupId>
7373
<artifactId>maven-pmd-plugin</artifactId>
74-
<version>3.27.0</version>
74+
<version>3.28.0</version>
7575
<configuration>
7676
<analysisCache>true</analysisCache>
7777
<includeTests>true</includeTests>

‎testcontainers-advanced-imagebuilder-demo/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1-labs
22
# Stage 1: Build the dummy app
3-
ARG JAVA_VERSION=21
3+
ARG JAVA_VERSION=25
44
FROM eclipse-temurin:$JAVA_VERSION-jdk-alpine AS build-env
55

66
RUN apk add --no-cache bash
@@ -26,7 +26,7 @@ RUN echo "Executing '$MAVEN_BUILD_COMMAND'"
2626
RUN ${MAVEN_BUILD_COMMAND}
2727

2828
# Stage 2: Build the executable image
29-
FROM eclipse-temurin:21-jre-alpine
29+
FROM eclipse-temurin:$JAVA_VERSION-jre-alpine
3030

3131
ARG user=dummy-app
3232
ARG group=dummy-app

‎testcontainers-advanced-imagebuilder-demo/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>software.xdev</groupId>
99
<artifactId>testcontainers-advanced-imagebuilder-root</artifactId>
10-
<version>2.3.1-SNAPSHOT</version>
10+
<version>2.4.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>testcontainers-advanced-imagebuilder-demo</artifactId>
14-
<version>2.3.1-SNAPSHOT</version>
14+
<version>2.4.0-SNAPSHOT</version>
1515
<packaging>jar</packaging>
1616

1717
<organization>

‎testcontainers-advanced-imagebuilder-dummy-app/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev</groupId>
88
<artifactId>testcontainers-advanced-imagebuilder-dummy-app</artifactId>
9-
<version>2.3.1-SNAPSHOT</version>
9+
<version>2.4.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<organization>
@@ -82,7 +82,7 @@
8282
<dependency>
8383
<groupId>com.puppycrawl.tools</groupId>
8484
<artifactId>checkstyle</artifactId>
85-
<version>11.1.0</version>
85+
<version>12.0.1</version>
8686
</dependency>
8787
</dependencies>
8888
<configuration>

‎testcontainers-advanced-imagebuilder/pom.xml‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>software.xdev</groupId>
88
<artifactId>testcontainers-advanced-imagebuilder</artifactId>
9-
<version>2.3.1-SNAPSHOT</version>
9+
<version>2.4.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>testcontainers-advanced-imagebuilder</name>
@@ -56,19 +56,7 @@
5656
<dependency>
5757
<groupId>org.testcontainers</groupId>
5858
<artifactId>testcontainers</artifactId>
59-
<version>1.21.3</version>
60-
<exclusions>
61-
<!-- No JUnit 4 -->
62-
<exclusion>
63-
<groupId>junit</groupId>
64-
<artifactId>junit</artifactId>
65-
</exclusion>
66-
</exclusions>
67-
</dependency>
68-
<dependency>
69-
<groupId>software.xdev</groupId>
70-
<artifactId>testcontainers-junit4-mock</artifactId>
71-
<version>1.0.2</version>
59+
<version>2.0.0</version>
7260
</dependency>
7361
<!-- Testcontainers is using outdated v1 -->
7462
<dependency>
@@ -77,6 +65,14 @@
7765
<version>2.0.17</version>
7866
</dependency>
7967

68+
<!-- Explicitly declared to prevent incompatibilities -->
69+
<!-- Original comes transitively from Testcontainers -->
70+
<dependency>
71+
<groupId>commons-io</groupId>
72+
<artifactId>commons-io</artifactId>
73+
<version>2.20.0</version>
74+
</dependency>
75+
8076
<!-- Tests -->
8177
<dependency>
8278
<groupId>org.junit.jupiter</groupId>
@@ -295,7 +291,7 @@
295291
<dependency>
296292
<groupId>com.puppycrawl.tools</groupId>
297293
<artifactId>checkstyle</artifactId>
298-
<version>11.1.0</version>
294+
<version>12.0.1</version>
299295
</dependency>
300296
</dependencies>
301297
<configuration>
@@ -320,7 +316,7 @@
320316
<plugin>
321317
<groupId>org.apache.maven.plugins</groupId>
322318
<artifactId>maven-pmd-plugin</artifactId>
323-
<version>3.27.0</version>
319+
<version>3.28.0</version>
324320
<configuration>
325321
<analysisCache>true</analysisCache>
326322
<includeTests>true</includeTests>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343
import java.util.zip.GZIPOutputStream;
4444

4545
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
46+
import org.apache.commons.io.FileUtils;
47+
import org.apache.commons.lang3.function.TriFunction;
4648
import org.slf4j.Logger;
4749
import org.slf4j.LoggerFactory;
4850
import org.testcontainers.DockerClientFactory;
@@ -53,8 +55,6 @@
5355
import org.testcontainers.images.builder.traits.DockerfileTrait;
5456
import org.testcontainers.images.builder.traits.FilesTrait;
5557
import org.testcontainers.images.builder.traits.StringsTrait;
56-
import org.testcontainers.shaded.org.apache.commons.io.FileUtils;
57-
import org.testcontainers.shaded.org.apache.commons.lang3.function.TriFunction;
5858
import org.testcontainers.utility.Base58;
5959
import org.testcontainers.utility.DockerImageName;
6060
import org.testcontainers.utility.DockerLoggerFactory;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
import java.util.stream.Collectors;
4040
import java.util.stream.Stream;
4141

42+
import org.apache.commons.io.FileUtils;
43+
import org.apache.commons.io.IOUtils;
4244
import org.slf4j.Logger;
4345
import org.slf4j.LoggerFactory;
44-
import org.testcontainers.shaded.org.apache.commons.io.FileUtils;
45-
import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
4646

4747
import software.xdev.testcontainers.imagebuilder.jgit.ignore.FastIgnoreRule;
4848
import software.xdev.testcontainers.imagebuilder.jgit.ignore.IgnoreNode;
@@ -177,7 +177,7 @@ protected static Stream<Path> findFiles(
177177
: Files.find(start, maxDepth, matcher, options);
178178
}
179179

180-
@SuppressWarnings("java:S2789")
180+
@SuppressWarnings({"java:S2789", "OptionalAssignedToNull"})
181181
protected Map.Entry<Path, String> determineFileForTransfer(
182182
final IgnoreNode ignoreNode,
183183
final Set<String> alwaysIncludedRelativePaths,
@@ -213,7 +213,7 @@ protected Map.Entry<Path, String> determineFileForTransfer(
213213
return outcomeDirs;
214214
}
215215

216-
@SuppressWarnings("java:S2789")
216+
@SuppressWarnings({"java:S2789", "OptionalAssignedToNull"})
217217
protected Map.Entry<Path, String> determineParentDirectoryForTransfer(
218218
final IgnoreNode ignoreNode,
219219
final Set<String> alwaysIncludedRelativePaths,
@@ -261,7 +261,7 @@ protected String parentDirectory(final String dir)
261261
: null;
262262
}
263263

264-
@SuppressWarnings("java:S2789")
264+
@SuppressWarnings({"java:S2789", "OptionalAssignedToNull"})
265265
protected Optional<Map.Entry<Path, String>> shouldIgnore(
266266
final IgnoreNode ignoreNode,
267267
final Set<String> alwaysIncludedRelativePaths,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030

3131
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
3232
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
33-
import org.testcontainers.shaded.org.apache.commons.io.FileUtils;
34-
import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
33+
import org.apache.commons.io.FileUtils;
34+
import org.apache.commons.io.IOUtils;
3535

3636
import software.xdev.testcontainers.imagebuilder.transfer.fcm.FileContentModifier;
3737

0 commit comments

Comments
 (0)