Merge branch 'master' into dev

Author: ST-DDT

build.gradle

@@ -9,22 +9,25 @@ buildscript {
         }
     }
     ext {
-        projectVersion = '2.11.0.RELEASE'
+        projectVersion = '2.12.0-SNAPSHOT'
 
         // https://github.com/grpc/grpc-java/releases
-        grpcVersion = '1.35.0'
+        grpcVersion = '1.37.0'
+
+        // https://github.com/google/guava/releases
+        guavaVersion = '30.1.1-jre'
         // https://github.com/protocolbuffers/protobuf/releases
-        protobufVersion = '3.14.0'
+        protobufVersion = '3.15.8'
         protobufGradlePluginVersion = '0.8.12'
 
         // https://github.com/spring-projects/spring-boot/releases
-        springBootVersion = '2.3.8.RELEASE'
+        springBootVersion = '2.4.5'
         // https://github.com/spring-cloud/spring-cloud-release/releases
-        springCloudVersion = 'Hoxton.SR9'
+        springCloudVersion = '2020.0.2'
         // https://github.com/alibaba/spring-cloud-alibaba/releases
-        springCloudAlibabaNacosVersion = '2.2.3.RELEASE'
+        springCloudAlibabaNacosVersion = '2021.1'
         // https://github.com/spring-projects/spring-security-oauth/releases
-        springSecurityOAuthVersion = '2.5.0.RELEASE'
+        springSecurityOAuthVersion = '2.5.1.RELEASE'
 
         lombokPluginVersion = '4.0.0'
         versioningPluginVersion = '2.14.0'
@@ -38,10 +41,10 @@ plugins {
     id 'org.springframework.boot' version "${springBootVersion}" apply false
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     id 'net.nemerosa.versioning' version '2.14.0'
-    id 'com.google.protobuf' version '0.8.14'
+    id 'com.google.protobuf' version '0.8.15'
     id 'io.franzbecker.gradle-lombok' version '4.0.0' apply false
     id 'com.github.ben-manes.versions' version '0.36.0' // gradle dependencyUpdates
-    id 'com.diffplug.spotless' version '5.9.0'
+    id 'com.diffplug.spotless' version '5.11.0'
 }
 
 // If you attempt to build without the `--scan` parameter in `gradle 6.0+` it will cause a build error that it can't find
@@ -57,7 +60,7 @@ if (hasProperty('buildScan')) {
 wrapper {
     // Update using:
     // ./gradlew wrapper --gradle-version=6.5 --distribution-type=bin
-    gradleVersion = '6.7.1'
+    gradleVersion = '7.0'
 }
 
 def buildTimeAndDate = OffsetDateTime.now()
@@ -95,11 +98,20 @@ allprojects {
         }
         format('misc') {
             target('**/*.gradle', '**/*.md', '**/*.yml')
+            targetExclude('**/build/**/*.*')
             trimTrailingWhitespace()
             endWithNewline()
         }
     }
 
+    normalization {
+        runtimeClasspath {
+            metaInf{
+                ignoreAttribute('Build-Time')
+            }
+        }
+    }
+
     // Copy LICENSE
     tasks.withType(Jar) {
         from(project.rootDir) {
@@ -157,6 +169,7 @@ allprojects { project ->
                 mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
                 mavenBom "com.alibaba.cloud:spring-cloud-alibaba-dependencies:${springCloudAlibabaNacosVersion}"
                 mavenBom "com.google.protobuf:protobuf-bom:${protobufVersion}"
+                mavenBom "com.google.guava:guava-bom:${guavaVersion}"
                 mavenBom "io.grpc:grpc-bom:${grpcVersion}"
                 mavenBom "org.junit:junit-bom:5.7.0"
             }

docs/en/versions.md

@@ -47,7 +47,7 @@ Current version.
 
 | Version | spring-boot | gRPC | Date |
 |:-------:|:-----------:|:----:| ---: |
-| 2.12.0* | 2.4.x | 1.34.1 | TBA |
+| 2.12.0* | 2.4.5 | 1.37.0 | Apr, 2021 |
 | 2.11.0 | 2.3.8 | 1.35.0 | Feb, 2021 |
 | 2.10.1 | 2.3.3 | 1.31.1 | Aug, 2020 |
 | 2.10.0 | 2.3.3 | 1.31.1 | Aug, 2020 |

examples/cloud-eureka-server/src/main/resources/bootstrap.yml renamed to examples/cloud-eureka-server/src/main/resources/application.yml

@@ -17,10 +17,11 @@ eureka:
     registerWithEureka: false
     fetchRegistry: false
     serviceUrl:
-            defaultZone: http://localhost:8761/eureka/
+      defaultZone: http://localhost:8761/eureka/
   server:
     enable-self-preservation: false
 
-endpoints:
- shutdown:
-  enabled: true
+management:
+  endpoint:
+    shutdown:
+      enabled: true

examples/cloud-grpc-client/build.gradle

@@ -6,8 +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 'io.zipkin.brave:brave-instrumentation-grpc'
+    implementation 'org.springframework.cloud:spring-cloud-starter-sleuth'
     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,8 +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 'io.zipkin.brave:brave-instrumentation-grpc'
+    implementation 'org.springframework.cloud:spring-cloud-starter-sleuth'
     implementation project(':grpc-server-spring-boot-starter') // replace to implementation "net.devh:grpc-server-spring-boot-starter:${springBootGrpcVersion}"
     implementation project(':examples:grpc-lib')
 }

gradle.properties

@@ -0,0 +1,5 @@
+org.gradle.caching=true
+org.gradle.parallel=true
+org.gradle.vfs.watch=true
+org.gradle.daemon=true
+

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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/advice/GrpcAdviceIsPresentCondition.java

@@ -42,7 +42,7 @@ public ConfigurationPhase getConfigurationPhase() {
     public boolean matches(final ConditionContext context, final AnnotatedTypeMetadata metadata) {
         final ConfigurableListableBeanFactory safeBeanFactory =
                 requireNonNull(context.getBeanFactory(), "ConfigurableListableBeanFactory is null");
-        return !safeBeanFactory.getBeansWithAnnotation(GrpcAdvice.class).isEmpty();
+        return safeBeanFactory.getBeanNamesForAnnotation(GrpcAdvice.class).length != 0;
     }
 
 }

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 {
 
     /**