From f26677eeeea1be217f8f6b22682d8f73db2d6943 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin.grzejszczak@gmail.com>
Date: Mon, 6 Apr 2020 13:04:51 +0200
Subject: [PATCH] Updated checker, function and asciidoctor

---
 pom.xml                                                  | 2 +-
 spring-cloud-contract-shade/pom.xml                      | 2 +-
 .../cloud/contract/stubrunner/AetherFactories.java       | 6 ++++--
 .../cloud/contract/stubrunner/AetherStubDownloader.java  | 6 ++++--
 .../cloud/contract/stubrunner/MavenSettings.java         | 9 ++++++---
 .../spring-cloud-contract-maven-plugin/pom.xml           | 2 +-
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index db5784400b..b2a2035665 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/spring-cloud-contract-shade/pom.xml b/spring-cloud-contract-shade/pom.xml
index bfbbfd2f8e..c035603cdf 100644
--- a/spring-cloud-contract-shade/pom.xml
+++ b/spring-cloud-contract-shade/pom.xml
@@ -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>
diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AetherFactories.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AetherFactories.java
index 32b8ef009f..97403c0b4d 100644
--- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AetherFactories.java
+++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AetherFactories.java
@@ -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;
 		}
diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AetherStubDownloader.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AetherStubDownloader.java
index 1aa8a0aa4c..2da40db6de 100644
--- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AetherStubDownloader.java
+++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/AetherStubDownloader.java
@@ -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) {
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 e6915b9c24..01a978613f 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
@@ -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);
 			}
 		}
 
 	}
+
 }
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
index 59caf664ed..9b0b95a0c2 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml
@@ -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