From d993830c4801c9d38446227b3c99efcb66ac13b5 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 19 Mar 2026 04:48:15 +0000 Subject: [PATCH 01/12] Update dependency org.testcontainers:testcontainers to v2.0.4 --- testcontainers/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testcontainers/pom.xml b/testcontainers/pom.xml index 629596be..bbe23a92 100644 --- a/testcontainers/pom.xml +++ b/testcontainers/pom.xml @@ -56,7 +56,7 @@ org.testcontainers testcontainers - 2.0.3 + 2.0.4 compile From 54101b81eaa26a331de00188f203ca651241d190 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 26 Mar 2026 04:56:05 +0000 Subject: [PATCH 02/12] Update dependency io.netty:netty-bom to v4.2.12.Final --- core/pom.xml | 2 +- server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 71af714c..6db7241d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -54,7 +54,7 @@ io.netty netty-bom - 4.2.10.Final + 4.2.12.Final pom import diff --git a/server/pom.xml b/server/pom.xml index 931d309b..2a294600 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -56,7 +56,7 @@ io.netty netty-bom - 4.2.10.Final + 4.2.12.Final pom import From 03772b764febe461c87bdf23e9a0fb44a99c581e Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 28 Mar 2026 04:46:26 +0000 Subject: [PATCH 03/12] Update dependency tools.jackson.core:jackson-databind to v3.1.1 --- core/pom.xml | 2 +- testcontainers/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 71af714c..f66a890b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -65,7 +65,7 @@ tools.jackson.core jackson-databind - 3.1.0 + 3.1.1 diff --git a/testcontainers/pom.xml b/testcontainers/pom.xml index 629596be..0e72aa1b 100644 --- a/testcontainers/pom.xml +++ b/testcontainers/pom.xml @@ -78,7 +78,7 @@ tools.jackson.core jackson-databind - 3.1.0 + 3.1.1 test From b6c60e60be46f6fa52a6fe415e0e0b16e8e2b886 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 28 Mar 2026 04:47:46 +0000 Subject: [PATCH 04/12] Update net.sourceforge.pmd to v7.23.0 --- pom.xml | 4 ++-- template-placeholder/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 4d536359..c19848ee 100644 --- a/pom.xml +++ b/pom.xml @@ -83,12 +83,12 @@ net.sourceforge.pmd pmd-core - 7.22.0 + 7.23.0 net.sourceforge.pmd pmd-java - 7.22.0 + 7.23.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index abef60d6..5931b6c2 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -253,12 +253,12 @@ net.sourceforge.pmd pmd-core - 7.22.0 + 7.23.0 net.sourceforge.pmd pmd-java - 7.22.0 + 7.23.0 From 7192c1a29f1848257b77974333a1108d2869db49 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 30 Mar 2026 05:09:13 +0000 Subject: [PATCH 05/12] Update dependency com.puppycrawl.tools:checkstyle to v13.4.0 --- pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4d536359..1f91c95f 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.puppycrawl.tools checkstyle - 13.3.0 + 13.4.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index abef60d6..97dc504b 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -215,7 +215,7 @@ com.puppycrawl.tools checkstyle - 13.3.0 + 13.4.0 From 225c79b88ca0fb52a376de459f5ed4c7890a498f Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 30 Mar 2026 14:59:05 +0200 Subject: [PATCH 06/12] Prepare for new templating system --- .config/topo/upstream.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .config/topo/upstream.yml diff --git a/.config/topo/upstream.yml b/.config/topo/upstream.yml new file mode 100644 index 00000000..d78d8935 --- /dev/null +++ b/.config/topo/upstream.yml @@ -0,0 +1,2 @@ +- url: https://github.com/xdev-software/base-template.git + branch: master From fcf8b930e9544886a329758cd7fe21ad474bd337 Mon Sep 17 00:00:00 2001 From: "Alex \"Blex\" B" <45384811+AB-xdev@users.noreply.github.com> Date: Mon, 30 Mar 2026 15:01:53 +0200 Subject: [PATCH 07/12] Update upstream.yml --- .config/topo/upstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/topo/upstream.yml b/.config/topo/upstream.yml index d78d8935..7821ddf6 100644 --- a/.config/topo/upstream.yml +++ b/.config/topo/upstream.yml @@ -1,2 +1,2 @@ -- url: https://github.com/xdev-software/base-template.git +- url: https://github.com/xdev-software/java-template.git branch: master From 687c673ae447c3881b1c6fc8541111ccf847c842 Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 30 Mar 2026 15:11:51 +0200 Subject: [PATCH 08/12] Update upstream.yml --- .config/topo/upstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/topo/upstream.yml b/.config/topo/upstream.yml index d78d8935..7821ddf6 100644 --- a/.config/topo/upstream.yml +++ b/.config/topo/upstream.yml @@ -1,2 +1,2 @@ -- url: https://github.com/xdev-software/base-template.git +- url: https://github.com/xdev-software/java-template.git branch: master From 4bf72672f99678dccea626dee8fecca0e5dd7ab8 Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 31 Mar 2026 09:52:33 +0200 Subject: [PATCH 09/12] Bump version to not conflict with testcontainers Fixes #403 --- CHANGELOG.md | 4 ++++ bom/pom.xml | 10 +++++----- client/pom.xml | 2 +- core/pom.xml | 2 +- pom.xml | 2 +- server/pom.xml | 2 +- testcontainers/pom.xml | 2 +- 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6062f3b3..31fa7882 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 2.50.5 +* Bumped version to one that does not conflict with testcontainers (and will likely not do so in the foreseeable future) #403 +* Updated dependencies + # 2.0.4 * Updated dependencies diff --git a/bom/pom.xml b/bom/pom.xml index 26f4ba43..3268d5e4 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -6,7 +6,7 @@ software.xdev.mockserver bom - 2.0.5-SNAPSHOT + 2.50.5-SNAPSHOT pom bom @@ -51,22 +51,22 @@ software.xdev.mockserver client - 2.0.5-SNAPSHOT + 2.50.5-SNAPSHOT software.xdev.mockserver core - 2.0.5-SNAPSHOT + 2.50.5-SNAPSHOT software.xdev.mockserver server - 2.0.5-SNAPSHOT + 2.50.5-SNAPSHOT software.xdev.mockserver testcontainers - 2.0.5-SNAPSHOT + 2.50.5-SNAPSHOT diff --git a/client/pom.xml b/client/pom.xml index 49dcdde1..4fdaa205 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -6,7 +6,7 @@ software.xdev.mockserver client - 2.0.5-SNAPSHOT + 2.50.5-SNAPSHOT jar client diff --git a/core/pom.xml b/core/pom.xml index 71af714c..2ffd7e9c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,7 +6,7 @@ software.xdev.mockserver core - 2.0.5-SNAPSHOT + 2.50.5-SNAPSHOT jar core diff --git a/pom.xml b/pom.xml index 3423cdcd..0ccbc576 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ software.xdev.mockserver root - 2.0.5-SNAPSHOT + 2.50.5-SNAPSHOT pom MockServer NeoLight diff --git a/server/pom.xml b/server/pom.xml index 931d309b..e0f65272 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -6,7 +6,7 @@ software.xdev.mockserver server - 2.0.5-SNAPSHOT + 2.50.5-SNAPSHOT jar server diff --git a/testcontainers/pom.xml b/testcontainers/pom.xml index 629596be..3a9a6756 100644 --- a/testcontainers/pom.xml +++ b/testcontainers/pom.xml @@ -6,7 +6,7 @@ software.xdev.mockserver testcontainers - 2.0.5-SNAPSHOT + 2.50.5-SNAPSHOT jar testcontainers From fa9ccfa8a0714ff512fb760675b7f14bf0534f21 Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 31 Mar 2026 09:54:49 +0200 Subject: [PATCH 10/12] Update upstream.yml --- .config/topo/upstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/topo/upstream.yml b/.config/topo/upstream.yml index 7821ddf6..0cc67cd2 100644 --- a/.config/topo/upstream.yml +++ b/.config/topo/upstream.yml @@ -1,2 +1,2 @@ -- url: https://github.com/xdev-software/java-template.git +- url: https://github.com/xdev-software/standard-maven-template.git branch: master From 90e450f39b6f6c0a19492c4657b562748e15b77e Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Tue, 31 Mar 2026 07:57:14 +0000 Subject: [PATCH 11/12] Update dependency com.puppycrawl.tools:checkstyle to v13.4.0 --- core/pom.xml | 2 +- server/pom.xml | 2 +- testcontainers/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 331834b4..b03a2ecb 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -271,7 +271,7 @@ com.puppycrawl.tools checkstyle - 13.3.0 + 13.4.0 diff --git a/server/pom.xml b/server/pom.xml index e373fa51..c45cc90b 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -290,7 +290,7 @@ com.puppycrawl.tools checkstyle - 13.3.0 + 13.4.0 diff --git a/testcontainers/pom.xml b/testcontainers/pom.xml index 4a85b115..564844b5 100644 --- a/testcontainers/pom.xml +++ b/testcontainers/pom.xml @@ -282,7 +282,7 @@ com.puppycrawl.tools checkstyle - 13.3.0 + 13.4.0 From 38ab841f1c0e23a12180c1424bc7cfff191b509d Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Tue, 31 Mar 2026 07:57:18 +0000 Subject: [PATCH 12/12] Update net.sourceforge.pmd to v7.23.0 --- core/pom.xml | 4 ++-- server/pom.xml | 4 ++-- testcontainers/pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 331834b4..f87a60fa 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -309,12 +309,12 @@ net.sourceforge.pmd pmd-core - 7.22.0 + 7.23.0 net.sourceforge.pmd pmd-java - 7.22.0 + 7.23.0 diff --git a/server/pom.xml b/server/pom.xml index e373fa51..6ced4bb1 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -328,12 +328,12 @@ net.sourceforge.pmd pmd-core - 7.22.0 + 7.23.0 net.sourceforge.pmd pmd-java - 7.22.0 + 7.23.0 diff --git a/testcontainers/pom.xml b/testcontainers/pom.xml index 4a85b115..442c46d8 100644 --- a/testcontainers/pom.xml +++ b/testcontainers/pom.xml @@ -320,12 +320,12 @@ net.sourceforge.pmd pmd-core - 7.22.0 + 7.23.0 net.sourceforge.pmd pmd-java - 7.22.0 + 7.23.0