Merge pull request #364 from yidongnan/update/spring227

Update to spring-boot v2.2.7, grpc v1.29.0 and more

Author: yidongnan

build.gradle

@@ -11,16 +11,15 @@ buildscript {
     ext {
         projectVersion = '2.8.0-SNAPSHOT'
 
-        grpcVersion = '1.28.1'
+        grpcVersion = '1.29.0'
         protobufVersion = '3.11.4'
         protobufGradlePluginVersion = '0.8.11'
 
-        springBootVersion = '2.2.6.RELEASE'
-        springCloudVersion = 'Hoxton.SR3'
+        springBootVersion = '2.2.7.RELEASE'
+        springCloudVersion = 'Hoxton.SR4'
         springDependencyManagementVersion = '1.0.9.RELEASE'
-        springCloudAlibabaNacosVersion = '2.2.0.RELEASE'
-        braveInstrumentationGrpc = '5.10.2'
-        springSecurityOAuthVersion = '2.4.0.RELEASE'
+        springCloudAlibabaNacosVersion = '2.2.1.RELEASE'
+        springSecurityOAuthVersion = '2.4.1.RELEASE'
 
         lombokPluginVersion = '3.2.0'
         versioningPluginVersion = '2.10.0'
@@ -34,13 +33,13 @@ plugins {
     id 'java'
     id 'java-library'
     // future improvement would be to use the version declared above in the ext block instead of repeating it here
-    id 'org.springframework.boot' version '2.2.6.RELEASE' apply false
+    id 'org.springframework.boot' version '2.2.7.RELEASE' apply false
     id 'io.spring.dependency-management' version '1.0.9.RELEASE'
-    id 'net.nemerosa.versioning' version '2.12.1'
+    id 'net.nemerosa.versioning' version '2.13.1'
     id 'com.google.protobuf' version '0.8.12'
-    id 'io.franzbecker.gradle-lombok' version '3.3.0' apply false
+    id 'io.franzbecker.gradle-lombok' version '4.0.0' apply false
     id 'com.github.ben-manes.versions' version '0.28.0' // gradle dependencyUpdates (Takes quite some time)
-    id 'com.diffplug.gradle.spotless' version '3.28.0'
+    id 'com.diffplug.gradle.spotless' version '4.0.1'
 }
 
 // If you attempt to build without the `--scan` parameter in `gradle 6.0+` it will cause a build error that it can't find
@@ -150,10 +149,10 @@ allprojects { project ->
     buildscript {
         dependencyManagement {
             imports {
-                mavenBom "io.grpc:grpc-bom:${grpcVersion}"
-                mavenBom "com.google.protobuf:protobuf-bom:${protobufVersion}"
                 mavenBom "org.springframework.boot:spring-boot-starter-parent:${springBootVersion}"
                 mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
+                mavenBom "com.google.protobuf:protobuf-bom:${protobufVersion}"
+                mavenBom "io.grpc:grpc-bom:${grpcVersion}"
             }
         }
 

docs/en/versions.md

@@ -47,7 +47,9 @@ Current version.
 
 | Version | spring-boot | gRPC | Date |
 |:-------:|:-----------:|:----:| ---: |
-| 2.8.0* | 2.2.6 | 1.28.1 | TBA |
+| 2.10.0* | 2.3.0 | 1.29.0 | TBA |
+| 2.9.0* | 2.3.0 | 1.29.0 | Jun, 2020 |
+| 2.8.0* | 2.2.7 | 1.29.0 | Jun, 2020 |
 | 2.7.0 | 2.2.4 | 1.27.1 | Feb, 2020 |
 | 2.6.2 | 2.2.1 | 1.25.0 | Jan, 2020 |
 | 2.6.1 | 2.2.1 | 1.25.0 | NOV, 2019 |

examples/cloud-grpc-client/build.gradle

@@ -7,7 +7,7 @@ dependencies {
     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:${braveInstrumentationGrpc}"
+    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

@@ -7,7 +7,7 @@ dependencies {
     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:${braveInstrumentationGrpc}"
+    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-client-spring-boot-autoconfigure/build.gradle

@@ -19,7 +19,7 @@ dependencies {
     optionalSupportImplementation 'org.springframework.cloud:spring-cloud-starter-sleuth'
     optionalSupportImplementation 'org.springframework.cloud:spring-cloud-starter-consul-discovery'
     optionalSupportImplementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
-    optionalSupportImplementation "io.zipkin.brave:brave-instrumentation-grpc:${braveInstrumentationGrpc}"
+    optionalSupportImplementation 'io.zipkin.brave:brave-instrumentation-grpc'
     optionalSupportImplementation 'javax.inject:javax.inject:1'
     // api comes from java-library, and allows exposure of the dependency to consumers of the library
     //  this means it can be used implicitly without specifying the dependency (unless you wish to override with a different version, or exclude)

grpc-common-spring-boot/build.gradle

@@ -17,5 +17,5 @@ dependencies {
     api('io.grpc:grpc-core')
 
     optionalSupportImplementation('org.springframework.cloud:spring-cloud-starter-sleuth')
-    optionalSupportImplementation("io.zipkin.brave:brave-instrumentation-grpc:${braveInstrumentationGrpc}")
+    optionalSupportImplementation('io.zipkin.brave:brave-instrumentation-grpc')
 }

grpc-server-spring-boot-autoconfigure/build.gradle

@@ -20,9 +20,9 @@ dependencies {
     optionalSupportImplementation 'org.springframework.cloud:spring-cloud-starter-sleuth'
     optionalSupportImplementation 'org.springframework.cloud:spring-cloud-starter-consul-discovery'
     optionalSupportImplementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
-    optionalSupportImplementation "com.alibaba.cloud:spring-cloud-alibaba-nacos-discovery:${springCloudAlibabaNacosVersion}"
-    optionalSupportImplementation 'com.google.inject:guice:4.2.2' // Only needed to avoid some warnings during compilation (for eureka)
-    optionalSupportImplementation "io.zipkin.brave:brave-instrumentation-grpc:${braveInstrumentationGrpc}"
+    optionalSupportImplementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:${springCloudAlibabaNacosVersion}"
+    optionalSupportImplementation 'com.google.inject:guice:4.2.3' // Only needed to avoid some warnings during compilation (for eureka)
+    optionalSupportImplementation 'io.zipkin.brave:brave-instrumentation-grpc'
     optionalSupportApi 'io.grpc:grpc-netty'
     api 'io.grpc:grpc-netty-shaded'
     api 'io.grpc:grpc-protobuf'