SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust to changes from Boot 3.3.

Browse Source
This commit is contained in:
Olga MaciaszekSharma
2024-03-06 18:20:39 +01:00
parent e7855dad96
commit d717a0934f
5 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -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>

25
spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/MavenSettings.java
View File

@@ -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);
}
}

3
spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerStubsPerConsumerSpec.groovy
View File

@@ -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,

2
spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerStubsPerConsumerWithConsumerNameSpec.groovy
View File

@@ -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",

2
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties
View File

@@ -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