diff --git a/pom.xml b/pom.xml
index 612225ed9d..7912a9f7ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
 		<!-- We need to have compatibility with Gradle -->
 		<groovy.version>4.0.16</groovy.version>
 		<!-- We need to have compatibility with Boot -->
-		<maven.version>3.6.3</maven.version>
+		<maven.version>3.9.4</maven.version>
 		<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
 		<!-- Resolver has to be aligned with Maven (e.g resolver 1.4 and Maven 3.6 or resolver 1.3 and Maven 3.5) -->
 		<maven.resolver.version>1.9.18</maven.resolver.version>
diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/MavenSettings.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/MavenSettings.java
index 6edadc72d1..bad3919042 100644
--- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/MavenSettings.java
+++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/MavenSettings.java
@@ -17,9 +17,10 @@
 package org.springframework.cloud.contract.stubrunner;
 
 import java.io.File;
+import java.util.HashMap;
 
 import org.sonatype.plexus.components.cipher.DefaultPlexusCipher;
-import org.sonatype.plexus.components.cipher.PlexusCipherException;
+import org.sonatype.plexus.components.cipher.PlexusCipher;
 import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher;
 import shaded.org.apache.maven.settings.crypto.DefaultSettingsDecrypter;
 import shaded.org.apache.maven.settings.crypto.SettingsDecrypter;
@@ -30,6 +31,8 @@ public class MavenSettings {
 
 	private static final String MAVEN_USER_CONFIG_DIRECTORY = "maven.user.config.dir";
 
+	private static final String SECURITY_XML = "settings-security.xml";
+
 	private final String homeDir;
 
 	public MavenSettings() {
@@ -57,22 +60,16 @@ public class MavenSettings {
 	}
 
 	public SettingsDecrypter createSettingsDecrypter() {
-		return new DefaultSettingsDecrypter(new SpringCloudContractSecDispatcher());
+		File file = new File(MavenSettings.this.homeDir, SECURITY_XML);
+		String configurationFilePath = file.getAbsolutePath();
+		return new DefaultSettingsDecrypter(
+				new SpringCloudContractSecDispatcher(new DefaultPlexusCipher(), configurationFilePath));
 	}
 
-	private class SpringCloudContractSecDispatcher extends DefaultSecDispatcher {
+	private static class SpringCloudContractSecDispatcher extends DefaultSecDispatcher {
 
-		private static final String SECURITY_XML = "settings-security.xml";
-
-		SpringCloudContractSecDispatcher() {
-			File file = new File(MavenSettings.this.homeDir, SECURITY_XML);
-			this._configurationFile = file.getAbsolutePath();
-			try {
-				this._cipher = new DefaultPlexusCipher();
-			}
-			catch (PlexusCipherException e) {
-				throw new IllegalStateException(e);
-			}
+		SpringCloudContractSecDispatcher(PlexusCipher cipher, String configurationFile) {
+			super(cipher, new HashMap<>(), configurationFile);
 		}
 
 	}
diff --git a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerStubsPerConsumerSpec.groovy b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerStubsPerConsumerSpec.groovy
index 912c607f43..b6377f4844 100644
--- a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerStubsPerConsumerSpec.groovy
+++ b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerStubsPerConsumerSpec.groovy
@@ -41,7 +41,8 @@ import org.springframework.test.context.ActiveProfiles
  * @author Marcin Grzejszczak
  */
 // tag::test[]
-@SpringBootTest(classes = Config, properties = ["spring.application.name=bar-consumer"])
+@SpringBootTest(classes = Config, properties = ["spring.application.name=bar-consumer",
+		"stubrunner.jms.enabled=false"])
 @AutoConfigureStubRunner(ids = "org.springframework.cloud.contract.verifier.stubs:producerWithMultipleConsumers",
 		repositoryRoot = "classpath:m2repo/repository/",
 		stubsMode = StubRunnerProperties.StubsMode.REMOTE,
diff --git a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerStubsPerConsumerWithConsumerNameSpec.groovy b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerStubsPerConsumerWithConsumerNameSpec.groovy
index f39fdf111a..d68556b764 100644
--- a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerStubsPerConsumerWithConsumerNameSpec.groovy
+++ b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerStubsPerConsumerWithConsumerNameSpec.groovy
@@ -41,7 +41,7 @@ import org.springframework.test.context.ActiveProfiles
  * @author Marcin Grzejszczak
  */
 // tag::test[]
-@SpringBootTest(classes = Config)
+@SpringBootTest(classes = Config, properties = "stubrunner.jms.enabled=false")
 @AutoConfigureStubRunner(ids = "org.springframework.cloud.contract.verifier.stubs:producerWithMultipleConsumers",
         repositoryRoot = "classpath:m2repo/repository/",
         consumerName = "foo-consumer",
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties
index b2dd52b652..fc53893349 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties
+++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties
@@ -21,6 +21,6 @@ aetherVersion=1.1.0
 springCloudBuildVersion=4.1.1-SNAPSHOT
 springVersion=6.0.10
 jacksonDatabindVersion=2.13.2.1
-mavenResolverVersion=1.4.1
+mavenResolverVersion=1.9.18
 jgitVersion=5.12.0.202106070339-r
 jschVersion=0.0.9