diff --git a/build.gradle b/build.gradle
index d1c4af82d..7870985a2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -330,20 +330,22 @@ artifacts {
 
 }
 
-task updateRootDocs << {
-    copy {
-        from "src/dist"
-        into "${rootProject.projectDir}"
-        include "notice.txt"
-        expand(copyright: new Date().format("yyyy"), version: project.version)
-        rename { filename -> "NOTICE" }
-    }
-
-    copy {
-        from "src/dist"
-        into "${rootProject.projectDir}"
-        include "license.txt"
-        rename { filename -> "LICENSE" }
+task updateRootDocs {
+    doLast {
+        copy {
+            from "src/dist"
+            into "${rootProject.projectDir}"
+            include "notice.txt"
+            expand(copyright: new Date().format("yyyy"), version: project.version)
+            rename { filename -> "NOTICE" }
+        }
+    
+        copy {
+            from "src/dist"
+            into "${rootProject.projectDir}"
+            include "license.txt"
+            rename { filename -> "LICENSE" }
+        }
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 9f99878ce..fa0812fe3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,9 @@
-h2Version=1.4.196
-springSecurityVersion=5.0.0.M5
+h2Version=1.4.197
+springSecurityVersion=5.0.5.RELEASE
 junitVersion=4.12
-httpComponentsVersion=4.5.3
-aspectjVersion=1.8.12
-springVersion=5.0.0.RELEASE
+httpComponentsVersion=4.5.5
+aspectjVersion=1.9.1
+springVersion=5.0.6.RELEASE
 springSnapshotVersion=latest.integration
 hamcrestVersion=1.3
 version=2.0.0.BUILD-SNAPSHOT
@@ -11,8 +11,8 @@ jacksonVersion=2.9.2
 jspApiVersion=2.3.2-b02
 servletApiVersion=3.1.0
 springReleaseVersion=latest.release
-mockitoVersion=2.11.0
+mockitoVersion=2.18.3
 javaxInjectVersion=1
-thymeleaf3Version=3.0.8.RELEASE
-thymeleafSpring5Version=3.0.8.RELEASE
-springBootVersion=2.0.0.RC2
+thymeleaf3Version=3.0.9.RELEASE
+thymeleafSpring5Version=3.0.9.RELEASE
+springBootVersion=2.0.2.RELEASE
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7c5acffea..ede52e05f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
diff --git a/spring-social-core/src/main/java/org/springframework/social/support/ClientHttpRequestFactorySelector.java b/spring-social-core/src/main/java/org/springframework/social/support/ClientHttpRequestFactorySelector.java
index b217d11de..d5bf4ab08 100644
--- a/spring-social-core/src/main/java/org/springframework/social/support/ClientHttpRequestFactorySelector.java
+++ b/spring-social-core/src/main/java/org/springframework/social/support/ClientHttpRequestFactorySelector.java
@@ -130,7 +130,7 @@ public boolean isTrusted(X509Certificate[] chain, String authType) throws Certif
 						return true;
 					}
 				};
-				return SSLContexts.custom().useProtocol("SSL").loadTrustMaterial(trustStore, allTrust).build();
+				return SSLContexts.custom().setProtocol("SSL").loadTrustMaterial(trustStore, allTrust).build();
 			} catch (KeyStoreException e) {
 				e.printStackTrace();
 			} catch (KeyManagementException e) {
diff --git a/spring-social-web/src/main/java/org/springframework/social/connect/web/GenericConnectionStatusView.java b/spring-social-web/src/main/java/org/springframework/social/connect/web/GenericConnectionStatusView.java
index b91c0252d..65e3da847 100644
--- a/spring-social-web/src/main/java/org/springframework/social/connect/web/GenericConnectionStatusView.java
+++ b/spring-social-web/src/main/java/org/springframework/social/connect/web/GenericConnectionStatusView.java
@@ -95,11 +95,8 @@ public static String generateConnectionViewHtml(String providerDisplayName, Stri
 			if (profile == null) {
 				builder.append("<h3>Connect to " + escProviderDisplayName + "</h3>");
 				builder.append("<form action=\"/connect/");
-				
-				try {
-					String escProviderId = UriUtils.encodePath(providerId, "UTF-8");
-					builder.append(escProviderId);
-				} catch (UnsupportedEncodingException e) { /* Default to UTF-8...should be fine.*/ }
+				String escProviderId = UriUtils.encodePath(providerId, "UTF-8");
+				builder.append(escProviderId);
 
 				builder.append("\" method=\"POST\">");
 				builder.append("<div class=\"formInfo\">");