From 17bcf0210a2729a69162e8b64c5fa4c48927b1e3 Mon Sep 17 00:00:00 2001 From: James D Bloom <733179+jamesdbloom@users.noreply.github.com> Date: Sun, 7 Jun 2026 22:40:30 +0100 Subject: [PATCH 1/2] Deprecate bundled MockServer module in favour of the MockServer-maintained module The bundled module has no configuration helpers and defaults to a retired image. MockServer now publishes and maintains its own Testcontainers module, org.mock-server:mockserver-testcontainers (org.mockserver.testcontainers.MockServerContainer), which derives the image tag from the client library so container and client stay in version lockstep and adds DNS, transparent-proxy, HTTP/3, initialization-JSON, log-level and arbitrary-property helpers plus direct MockServerClient wiring. This deprecates the bundled classes with a Javadoc pointer to the maintained module, and adds a note to the module docs recommending it for new projects. Signed-off-by: James D Bloom <733179+jamesdbloom@users.noreply.github.com> --- docs/modules/mockserver.md | 9 +++++++++ .../testcontainers/containers/MockServerContainer.java | 8 +++++++- .../testcontainers/mockserver/MockServerContainer.java | 10 ++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/docs/modules/mockserver.md b/docs/modules/mockserver.md index e6a0ee91ece..8375f005c5f 100644 --- a/docs/modules/mockserver.md +++ b/docs/modules/mockserver.md @@ -1,5 +1,14 @@ # Mockserver Module +!!! note "Deprecated — use the MockServer-maintained module for new projects" + This bundled module is deprecated. For new projects, prefer the MockServer-maintained + module [`org.mock-server:mockserver-testcontainers`](https://www.mock-server.com/mock_server/mockserver_testcontainers.html) + (class `org.mockserver.testcontainers.MockServerContainer`). It tracks current MockServer + releases, derives its image tag from the client library so the container and client stay in + lockstep, and adds configuration helpers (DNS, transparent proxy, HTTP/3, initialization JSON, + log level, arbitrary properties) plus direct `MockServerClient` wiring. This page documents the + legacy bundled module. + Mock Server can be used to mock HTTP services by matching requests against user-defined expectations. ## Usage example diff --git a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java index 47d2399d934..63666527ce9 100644 --- a/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java +++ b/modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java @@ -5,7 +5,13 @@ import org.testcontainers.utility.DockerImageName; /** - * @deprecated use {@link org.testcontainers.mockserver.MockServerContainer} instead. + * @deprecated Use the MockServer-maintained module instead: + * {@code org.mock-server:mockserver-testcontainers} + * (class {@code org.mockserver.testcontainers.MockServerContainer}). It tracks current MockServer + * releases, derives its image tag from the client library so the two stay in lockstep, and adds + * configuration helpers (DNS, transparent proxy, HTTP/3, initialization JSON, log level, arbitrary + * properties) plus direct {@code MockServerClient} wiring. See + * https://www.mock-server.com/mock_server/mockserver_testcontainers.html */ @Slf4j @Deprecated diff --git a/modules/mockserver/src/main/java/org/testcontainers/mockserver/MockServerContainer.java b/modules/mockserver/src/main/java/org/testcontainers/mockserver/MockServerContainer.java index cbfcbc9fd66..b0f7f8a23ab 100644 --- a/modules/mockserver/src/main/java/org/testcontainers/mockserver/MockServerContainer.java +++ b/modules/mockserver/src/main/java/org/testcontainers/mockserver/MockServerContainer.java @@ -5,7 +5,17 @@ import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.utility.DockerImageName; +/** + * @deprecated Use the MockServer-maintained module instead: + * {@code org.mock-server:mockserver-testcontainers} + * (class {@code org.mockserver.testcontainers.MockServerContainer}). It tracks current MockServer + * releases, derives its image tag from the client library so the two stay in lockstep, and adds + * configuration helpers (DNS, transparent proxy, HTTP/3, initialization JSON, log level, arbitrary + * properties) plus direct {@code MockServerClient} wiring. See + * https://www.mock-server.com/mock_server/mockserver_testcontainers.html + */ @Slf4j +@Deprecated public class MockServerContainer extends GenericContainer { private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("jamesdbloom/mockserver"); From 59f0ba45efb271eb1bfddef37309c76d2ba5a1ac Mon Sep 17 00:00:00 2001 From: James D Bloom <733179+jamesdbloom@users.noreply.github.com> Date: Sun, 7 Jun 2026 22:40:30 +0100 Subject: [PATCH 2/2] Refresh stale default MockServer image to mockserver/mockserver:mockserver-7.0.0 The default image was the retired jamesdbloom/mockserver:mockserver-5.5.4. Point it at the current mockserver/mockserver:mockserver-7.0.0. assertCompatibleWith already accepts both jamesdbloom/mockserver and mockserver/mockserver, so existing callers are unaffected. Signed-off-by: James D Bloom <733179+jamesdbloom@users.noreply.github.com> --- .../org/testcontainers/mockserver/MockServerContainer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mockserver/src/main/java/org/testcontainers/mockserver/MockServerContainer.java b/modules/mockserver/src/main/java/org/testcontainers/mockserver/MockServerContainer.java index b0f7f8a23ab..3373cb4dd1c 100644 --- a/modules/mockserver/src/main/java/org/testcontainers/mockserver/MockServerContainer.java +++ b/modules/mockserver/src/main/java/org/testcontainers/mockserver/MockServerContainer.java @@ -18,9 +18,9 @@ @Deprecated public class MockServerContainer extends GenericContainer { - private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("jamesdbloom/mockserver"); + private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mockserver/mockserver"); - private static final String DEFAULT_TAG = "mockserver-5.5.4"; + private static final String DEFAULT_TAG = "mockserver-7.0.0"; @Deprecated public static final String VERSION = DEFAULT_TAG;