From 92a03e6871f25e6a93ab72add5cf42df9fc360e1 Mon Sep 17 00:00:00 2001 From: mayur-solace Date: Mon, 2 Mar 2026 15:53:23 -0500 Subject: [PATCH 1/3] Update dependencies --- junit-jupiter/pom.xml | 2 +- pom.xml | 12 ++++++------ semp-client/pom.xml | 2 +- testcontainer/pom.xml | 9 ++++++++- .../testcontainer/PubSubPlusContainerIT.java | 5 +++-- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/junit-jupiter/pom.xml b/junit-jupiter/pom.xml index 2749831..20b2af4 100644 --- a/junit-jupiter/pom.xml +++ b/junit-jupiter/pom.xml @@ -33,7 +33,7 @@ org.testcontainers - toxiproxy + testcontainers-toxiproxy diff --git a/pom.xml b/pom.xml index fd66da6..f8473c2 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ UTF-8 SolaceDev - 10.25.1 + 10.29.1 @@ -72,7 +72,7 @@ org.springframework.boot spring-boot-dependencies - 3.4.1 + 4.0.3 pom import @@ -80,7 +80,7 @@ org.testcontainers testcontainers-bom - 1.20.4 + 2.0.3 pom import @@ -106,13 +106,13 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.2 + 3.2.5 org.apache.maven.plugins maven-failsafe-plugin - 2.22.2 + 3.2.5 @@ -126,7 +126,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.1.0 + 1.7.3 true oss diff --git a/semp-client/pom.xml b/semp-client/pom.xml index 858a370..9fc8c13 100644 --- a/semp-client/pom.xml +++ b/semp-client/pom.xml @@ -78,7 +78,7 @@ org.testcontainers - junit-jupiter + testcontainers-junit-jupiter test diff --git a/testcontainer/pom.xml b/testcontainer/pom.xml index 067b248..e14d27e 100644 --- a/testcontainer/pom.xml +++ b/testcontainer/pom.xml @@ -25,9 +25,10 @@ test + org.testcontainers - junit-jupiter + testcontainers-junit-jupiter test @@ -37,6 +38,12 @@ test + + com.fasterxml.jackson.core + jackson-databind + test + + com.solacesystems sol-jcsmp diff --git a/testcontainer/src/test/java/com/solace/test/integration/testcontainer/PubSubPlusContainerIT.java b/testcontainer/src/test/java/com/solace/test/integration/testcontainer/PubSubPlusContainerIT.java index 7e2e1ea..ca38c6a 100644 --- a/testcontainer/src/test/java/com/solace/test/integration/testcontainer/PubSubPlusContainerIT.java +++ b/testcontainer/src/test/java/com/solace/test/integration/testcontainer/PubSubPlusContainerIT.java @@ -18,12 +18,13 @@ import java.time.Duration; import java.util.Optional; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.testcontainers.shaded.org.hamcrest.CoreMatchers.containsString; +import static org.testcontainers.shaded.org.hamcrest.MatcherAssert.assertThat; @Testcontainers public class PubSubPlusContainerIT { From 18bdc1053d2308cb07c909b00b3240ac4a43d920 Mon Sep 17 00:00:00 2001 From: mayur-solace Date: Mon, 2 Mar 2026 16:12:41 -0500 Subject: [PATCH 2/3] Update dependencies --- testcontainer/pom.xml | 6 ------ .../integration/testcontainer/PubSubPlusContainerIT.java | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/testcontainer/pom.xml b/testcontainer/pom.xml index e14d27e..a1e2dbb 100644 --- a/testcontainer/pom.xml +++ b/testcontainer/pom.xml @@ -38,12 +38,6 @@ test - - com.fasterxml.jackson.core - jackson-databind - test - - com.solacesystems sol-jcsmp diff --git a/testcontainer/src/test/java/com/solace/test/integration/testcontainer/PubSubPlusContainerIT.java b/testcontainer/src/test/java/com/solace/test/integration/testcontainer/PubSubPlusContainerIT.java index ca38c6a..0a7dd2e 100644 --- a/testcontainer/src/test/java/com/solace/test/integration/testcontainer/PubSubPlusContainerIT.java +++ b/testcontainer/src/test/java/com/solace/test/integration/testcontainer/PubSubPlusContainerIT.java @@ -1,6 +1,6 @@ package com.solace.test.integration.testcontainer; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import com.solacesystems.jcsmp.JCSMPFactory; import com.solacesystems.jcsmp.JCSMPProperties; import com.solacesystems.jcsmp.JCSMPSession; From 3976cc819d0ff32edc24acff99daffaf11d40f66 Mon Sep 17 00:00:00 2001 From: mayur-solace Date: Mon, 2 Mar 2026 17:46:32 -0500 Subject: [PATCH 3/3] Update dependencies --- .../junit/jupiter/extension/PubSubPlusExtension.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/junit-jupiter/src/main/java/com/solace/test/integration/junit/jupiter/extension/PubSubPlusExtension.java b/junit-jupiter/src/main/java/com/solace/test/integration/junit/jupiter/extension/PubSubPlusExtension.java index 0eb6fdf..76c2ef8 100644 --- a/junit-jupiter/src/main/java/com/solace/test/integration/junit/jupiter/extension/PubSubPlusExtension.java +++ b/junit-jupiter/src/main/java/com/solace/test/integration/junit/jupiter/extension/PubSubPlusExtension.java @@ -356,7 +356,7 @@ private static ToxiproxyContainer createToxiproxyContainer(ExtensionContext exte PubSubPlusContainer pubSubPlusContainer) { return extensionContext.getStore(toxiproxyNamespace).getOrComputeIfAbsent(ToxiproxyContainerResource.class, key -> { LOG.info("Creating Toxiproxy container"); - ToxiproxyContainer container = new ToxiproxyContainer(DockerImageName.parse("shopify/toxiproxy:2.1.0")); + ToxiproxyContainer container = new ToxiproxyContainer(DockerImageName.parse("ghcr.io/shopify/toxiproxy:2.9.0")); if (pubSubPlusContainer != null) { if (pubSubPlusContainer.getNetwork() != null) { container.withNetwork(pubSubPlusContainer.getNetwork()).withNetworkAliases(TOXIPROXY_NETWORK_ALIAS);