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

Updated checker, function and asciidoctor

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-04-06 13:04:51 +02:00
parent 9c009f92bf
commit f26677eeee
6 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -34,7 +34,7 @@
<spring-cloud-netflix.version>3.0.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<spring-cloud-consul.version>3.0.0.BUILD-SNAPSHOT</spring-cloud-consul.version>
<spring-cloud-commons.version>3.0.0.BUILD-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-function.version>3.0.2.BUILD-SNAPSHOT</spring-cloud-function.version>
<spring-cloud-function.version>3.0.3.BUILD-SNAPSHOT</spring-cloud-function.version>
<jopt-simple.version>5.0.4</jopt-simple.version>
<cglib.version>3.2.9</cglib.version>
<spock-spring.version>1.3-groovy-2.5</spock-spring.version>

2
spring-cloud-contract-shade/pom.xml
View File

@@ -10,7 +10,7 @@
<guice.version>4.2.2</guice.version>
<guava.version>28.1-jre</guava.version>
<asm.version>7.1</asm.version>
<checker.version>2.11.0</checker.version>
<checker.version>3.1.1</checker.version>
<maven-shade-plugin.version>3.2.1</maven-shade-plugin.version>
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>

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

@@ -134,10 +134,12 @@ final class AetherFactories {
private static File userSettings() {
String user = fromSystemPropOrEnv(MAVEN_USER_SETTINGS_LOCATION);
if (user == null) {
File file = new File(new File(System.getProperty("user.home")).getAbsoluteFile(),
File file = new File(
new File(System.getProperty("user.home")).getAbsoluteFile(),
File.separator + ".m2" + File.separator + "settings.xml");
if (log.isDebugEnabled()) {
log.debug("No custom maven user settings provided, will use [" + file + "]");
log.debug("No custom maven user settings provided, will use [" + file
+ "]");
}
return file;
}

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

@@ -179,7 +179,8 @@ public class AetherStubDownloader implements StubDownloader {
Server stubServer = this.settings.getServer(stubRunnerOptions.serverId);
if (stubServer != null) {
if (log.isDebugEnabled()) {
log.debug("Custom server id [" + stubServer.getId() + "] passed will resolve credentials");
log.debug("Custom server id [" + stubServer.getId()
+ "] passed will resolve credentials");
}
SettingsDecryptionRequest settingsDecryptionRequest = new DefaultSettingsDecryptionRequest(
stubServer);
@@ -188,7 +189,8 @@ public class AetherStubDownloader implements StubDownloader {
return buildAuthentication(stubServerPassword, stubServer.getUsername());
}
}
return buildAuthentication(stubRunnerOptions.password, stubRunnerOptions.username);
return buildAuthentication(stubRunnerOptions.password,
stubRunnerOptions.username);
}
Authentication buildAuthentication(String stubServerPassword, String username) {

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

@@ -65,12 +65,13 @@ public class MavenSettings {
}
private void setField(Class<?> sourceClass, String fieldName, Object target,
Object value) {
Object value) {
try {
Field field = sourceClass.getDeclaredField(fieldName);
field.setAccessible(true);
field.set(target, value);
} catch (Exception ex) {
}
catch (Exception ex) {
throw new IllegalStateException(
"Failed to set field '" + fieldName + "' on '" + target + "'", ex);
}
@@ -85,10 +86,12 @@ public class MavenSettings {
this._configurationFile = file.getAbsolutePath();
try {
this._cipher = new DefaultPlexusCipher();
} catch (PlexusCipherException e) {
}
catch (PlexusCipherException e) {
throw new IllegalStateException(e);
}
}
}
}

2
spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
View File

@@ -29,7 +29,7 @@
<maven.plugin.plugin.version>3.6.0</maven.plugin.plugin.version>
<maven-failsafe-plugin.version>3.0.0-M3</maven-failsafe-plugin.version>
<asciidoctor-maven-plugin.version>1.5.7.1</asciidoctor-maven-plugin.version>
<asciidoctor-maven-plugin.version>1.6.0</asciidoctor-maven-plugin.version>
<maven-filtering.version>3.1.1</maven-filtering.version>
<maven-scm-publish-plugin.version>3.0.0</maven-scm-publish-plugin.version>
<maven-project-info-reports-plugin.version>3.0.0