Merge pull request #371 from yidongnan/update/spring-v231

Update dependencies

Author: yidongnan

build.gradle

@@ -9,36 +9,40 @@ buildscript {
         }
     }
     ext {
-        projectVersion = '2.8.0.RELEASE'
+        projectVersion = '2.9.0-SNAPSHOT'
 
-        grpcVersion = '1.29.0'
-        protobufVersion = '3.11.4'
+        // https://github.com/grpc/grpc-java/releases
+        grpcVersion = '1.30.0'
+        // https://github.com/protocolbuffers/protobuf/releases
+        protobufVersion = '3.12.2'
         protobufGradlePluginVersion = '0.8.11'
 
-        springBootVersion = '2.2.7.RELEASE'
-        springCloudVersion = 'Hoxton.SR4'
+        // https://github.com/spring-projects/spring-boot/releases
+        springBootVersion = '2.3.1.RELEASE'
+        // https://github.com/spring-cloud/spring-cloud-release/releases
+        springCloudVersion = 'Hoxton.SR5'
+        // https://github.com/alibaba/spring-cloud-alibaba/releases
         springCloudAlibabaNacosVersion = '2.2.1.RELEASE'
-        springSecurityOAuthVersion = '2.4.1.RELEASE'
+        // https://github.com/spring-projects/spring-security-oauth/releases/tag/2.5.0.RELEASE
+        springSecurityOAuthVersion = '2.5.0.RELEASE'
 
         lombokPluginVersion = '3.2.0'
         versioningPluginVersion = '2.10.0'
         versionsPluginVersion = '0.27.0'
-
-        nimbusJoseJwtVersion = '8.11'
     }
 }
 
 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.7.RELEASE' apply false
+    id 'org.springframework.boot' version '2.3.1.RELEASE' apply false
     id 'io.spring.dependency-management' version '1.0.9.RELEASE'
     id 'net.nemerosa.versioning' version '2.13.1'
     id 'com.google.protobuf' version '0.8.12'
     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 '4.0.1'
+    id 'com.diffplug.gradle.spotless' version '4.3.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
@@ -52,7 +56,9 @@ if (hasProperty('buildScan')) {
 
 // you may use IntelliJ's project configuration to make it use the gradle version defined in the gradle script's wrapper section
 wrapper {
-    gradleVersion = '6.2.1'
+    // Update using:
+    // ./gradlew wrapper --gradle-version=6.5 --distribution-type=bin
+    gradleVersion = '6.5'
 }
 
 def buildTimeAndDate = OffsetDateTime.now()

docs/en/versions.md

@@ -47,8 +47,8 @@ Current version.
 
 | Version | spring-boot | gRPC | Date |
 |:-------:|:-----------:|:----:| ---: |
-| 2.10.0* | 2.3.0 | 1.29.0 | TBA |
-| 2.9.0* | 2.3.0 | 1.29.0 | Jun, 2020 |
+| 2.10.0* | 2.3.1 | 1.30.0 | TBA |
+| 2.9.0* | 2.3.1 | 1.30.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 |

examples/security-grpc-bearerAuth-server/build.gradle

@@ -8,7 +8,6 @@ dependencies {
     implementation 'org.springframework.security:spring-security-oauth2-client'
     implementation project(':grpc-server-spring-boot-starter') // replace to implementation("net.devh:grpc-server-spring-boot-starter:${springBootGrpcVersion}")
     implementation project(':examples:grpc-lib')
-    implementation 'com.nimbusds:nimbus-jose-jwt:${nimbusJoseJwtVersion}'
     implementation "org.springframework.security.oauth:spring-security-oauth2:${springSecurityOAuthVersion}"
     implementation 'org.springframework.security:spring-security-web'
     implementation 'org.springframework.security:spring-security-oauth2-resource-server'

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew

@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

gradlew.bat

@@ -15,6 +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('org.springframework.cloud:spring-cloud-starter-sleuth')
     optionalSupportImplementation('io.zipkin.brave:brave-instrumentation-grpc')