Skip to content

Release #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AB-xdev merged 14 commits into from
Oct 16, 2025
Merged

Release #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
eb55a68
Merge pull request #191 from xdev-software/master
AB-xdev Oct 9, 2025
43afe18
Update dependency com.puppycrawl.tools:checkstyle to v12
xdev-renovate Oct 10, 2025
f96c78b
Merge pull request #212 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Oct 10, 2025
bade0c4
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Oct 13, 2025
ec22008
Update dependency org.apache.maven.plugins:maven-pmd-plugin to v3.28.0
xdev-renovate Oct 13, 2025
a6b051d
Update dependency com.puppycrawl.tools:checkstyle to v12.0.1
xdev-renovate Oct 13, 2025
d045899
Update dependency org.testcontainers:testcontainers to v2
xdev-renovate Oct 15, 2025
67783a8
Update Demo to Java 25
AB-xdev Oct 16, 2025
4d59c55
Update to Testcontainers v2
AB-xdev Oct 16, 2025
e5dff69
Update CHANGELOG.md
AB-xdev Oct 16, 2025
3f4aca7
Bump version
AB-xdev Oct 16, 2025
a3c1201
Merge pull request #193 from xdev-software/renovate/org.apache.maven.…
AB-xdev Oct 16, 2025
564ae2b
Merge pull request #192 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Oct 16, 2025
6fb2f38
Merge branch 'develop' of https://github.com/xdev-software/testcontai…
AB-xdev Oct 16, 2025
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 2.4.0
* Update to Testcontainers v2

# 2.3.0
* Use Virtual Threads on Java 21+
* Minor optimizations
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>software.xdev</groupId>
<artifactId>testcontainers-advanced-imagebuilder-root</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.4.0-SNAPSHOT</version>
<packaging>pom</packaging>

<organization>
Expand Down Expand Up @@ -46,7 +46,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 @@ -71,7 +71,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-advanced-imagebuilder-demo/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1-labs
# Stage 1: Build the dummy app
ARG JAVA_VERSION=21
ARG JAVA_VERSION=25
FROM eclipse-temurin:$JAVA_VERSION-jdk-alpine AS build-env

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

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

ARG user=dummy-app
ARG group=dummy-app
Expand Down
4 changes: 2 additions & 2 deletions testcontainers-advanced-imagebuilder-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<parent>
<groupId>software.xdev</groupId>
<artifactId>testcontainers-advanced-imagebuilder-root</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.4.0-SNAPSHOT</version>
</parent>

<artifactId>testcontainers-advanced-imagebuilder-demo</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.4.0-SNAPSHOT</version>
<packaging>jar</packaging>

<organization>
Expand Down
4 changes: 2 additions & 2 deletions testcontainers-advanced-imagebuilder-dummy-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>software.xdev</groupId>
<artifactId>testcontainers-advanced-imagebuilder-dummy-app</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.4.0-SNAPSHOT</version>
<packaging>jar</packaging>

<organization>
Expand Down Expand Up @@ -82,7 +82,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>11.1.0</version>
<version>12.0.1</version>
</dependency>
</dependencies>
<configuration>
Expand Down
28 changes: 12 additions & 16 deletions testcontainers-advanced-imagebuilder/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>software.xdev</groupId>
<artifactId>testcontainers-advanced-imagebuilder</artifactId>
<version>2.3.1-SNAPSHOT</version>
<version>2.4.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>testcontainers-advanced-imagebuilder</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 -->
<dependency>
Expand All @@ -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>
Expand Down Expand Up @@ -295,7 +291,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 @@ -320,7 +316,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 .../src/main/java/software/xdev/testcontainers/imagebuilder/AdvancedImageFromDockerFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions .../java/software/xdev/testcontainers/imagebuilder/transfer/DefaultTransferFilesCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions ...java/software/xdev/testcontainers/imagebuilder/transfer/TransferArchiveTARCompressor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down