Update plugin and dependencies versions

* And update GradleWrapper to 7.0.2
* And fix deprecation warning in WebClientConfig for HttpClient#from call

Author: pacphi

build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'org.springframework.boot' version '2.4.5'
     // id 'org.springframework.experimental.aot' version '0.9.2'
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
-    id 'com.github.ben-manes.versions' version '0.38.0'
+    id 'com.github.ben-manes.versions' version '0.39.0'
     id 'io.franzbecker.gradle-lombok' version '4.0.0'
 	id 'java'
     id 'jacoco'
@@ -49,7 +49,7 @@ repositories {
 
 ext {
 	set('springCloudServicesVersion', '3.2.1.RELEASE')
-	set('springCloudVersion', '2020.0.2')
+	set('springCloudVersion', '2020.0.3')
     set('spring-cloud-services-connectors.version', '3.2.1.RELEASE')
 }
 

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-6.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip

src/main/java/io/pivotal/cfapp/config/WebClientConfig.java

@@ -13,7 +13,6 @@
 import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
 import reactor.netty.http.client.HttpClient;
-import reactor.netty.tcp.TcpClient;
 
 @RefreshScope
 @Configuration
@@ -24,22 +23,14 @@ public class WebClientConfig {
     @Bean
     @ConditionalOnProperty(name = "cf.sslValidationSkipped", havingValue="true")
     public WebClient insecureWebClient(WebClient.Builder builder) throws SSLException {
-        SslContext sslContext =
-            SslContextBuilder
-                .forClient()
-                .trustManager(InsecureTrustManagerFactory.INSTANCE)
-                .build();
-        TcpClient tcpClient = TcpClient.create().secure(sslProviderBuilder -> sslProviderBuilder.sslContext(sslContext));
-        HttpClient httpClient = HttpClient.from(tcpClient);
-        return builder
-                .clientConnector(new ReactorClientHttpConnector(httpClient))
-                .build();
+        SslContext context = SslContextBuilder.forClient().trustManager(InsecureTrustManagerFactory.INSTANCE).build();
+        HttpClient httpClient = HttpClient.create().secure(t -> t.sslContext(context));
+        return WebClient.builder().clientConnector(new ReactorClientHttpConnector(httpClient)).build();
     }
 
     @Bean
     @ConditionalOnProperty(name = "cf.sslValidationSkipped", havingValue="false", matchIfMissing=true)
     public WebClient secureWebClient(WebClient.Builder builder) {
-          return builder
-                    .build();
+        return builder.build();
     }
-}
+}