Update spring boot to 2.4.x

Author: genuss

build.gradle

@@ -18,9 +18,9 @@ buildscript {
         protobufGradlePluginVersion = '0.8.12'
 
         // https://github.com/spring-projects/spring-boot/releases
-        springBootVersion = '2.3.8.RELEASE'
+        springBootVersion = '2.4.3'
         // https://github.com/spring-cloud/spring-cloud-release/releases
-        springCloudVersion = 'Hoxton.SR9'
+        springCloudVersion = '2020.0.1'
         // https://github.com/alibaba/spring-cloud-alibaba/releases
         springCloudAlibabaNacosVersion = '2.2.3.RELEASE'
         // https://github.com/spring-projects/spring-security-oauth/releases

examples/cloud-grpc-client/build.gradle

@@ -6,7 +6,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
-    implementation 'org.springframework.cloud:spring-cloud-starter-zipkin'
+    implementation 'org.springframework.cloud:spring-cloud-sleuth-zipkin'
     implementation 'io.zipkin.brave:brave-instrumentation-grpc'
     implementation project(':grpc-client-spring-boot-starter') // replace to implementation("net.devh:grpc-client-spring-boot-starter:${springBootGrpcVersion}")
     implementation project(':examples:grpc-lib')

examples/cloud-grpc-server/build.gradle

@@ -6,7 +6,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
-    implementation 'org.springframework.cloud:spring-cloud-starter-zipkin'
+    implementation 'org.springframework.cloud:spring-cloud-sleuth-zipkin'
     implementation 'io.zipkin.brave:brave-instrumentation-grpc'
     implementation project(':grpc-server-spring-boot-starter') // replace to implementation "net.devh:grpc-server-spring-boot-starter:${springBootGrpcVersion}"
     implementation project(':examples:grpc-lib')

grpc-common-spring-boot/build.gradle

@@ -15,7 +15,7 @@ dependencies {
     api('org.springframework.boot:spring-boot-starter')
     optionalSupportImplementation('org.springframework.boot:spring-boot-starter-actuator')
     api('io.grpc:grpc-core')
-    optionalSupportImplementation('com.google.guava:guava')
+    optionalSupportImplementation('com.google.guava:guava:30.1-jre')
 
     optionalSupportImplementation('org.springframework.cloud:spring-cloud-starter-sleuth')
     optionalSupportImplementation('io.zipkin.brave:brave-instrumentation-grpc')

grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/autoconfigure/GrpcCommonTraceAutoConfiguration.java

@@ -21,7 +21,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration;
+import org.springframework.cloud.sleuth.autoconfig.brave.BraveAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -30,7 +30,7 @@
 
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnProperty(value = "spring.sleuth.grpc.enabled", matchIfMissing = true)
-@AutoConfigureAfter(TraceAutoConfiguration.class)
+@AutoConfigureAfter(BraveAutoConfiguration.class)
 @ConditionalOnClass(value = {Tracing.class, GrpcTracing.class})
 public class GrpcCommonTraceAutoConfiguration {
 

grpc-server-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/server/autoconfigure/GrpcServerSecurityAutoConfiguration.java

@@ -20,7 +20,7 @@
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.security.servlet.WebSecurityEnablerConfiguration;
+import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.access.AccessDecisionManager;
@@ -61,7 +61,7 @@
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnBean(AuthenticationManager.class)
-@AutoConfigureAfter(WebSecurityEnablerConfiguration.class)
+@AutoConfigureAfter(SecurityAutoConfiguration.class)
 public class GrpcServerSecurityAutoConfiguration {
 
     /**