Merge pull request #970 from yidongnan/support_springboot-3.x

[WIP] Support Spring Boot 3.x

Author: yidongnan

.github/workflows/build-master.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['8', '11']
+        java: ['17']
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -22,7 +22,7 @@ jobs:
       - name: Set up java ${{ matrix.java }}
         uses: actions/setup-java@v3
         with:
-          distribution: temurin
+          distribution: 'temurin'
           java-version: ${{ matrix.java }}
           check-latest: true
 
@@ -35,7 +35,7 @@ jobs:
           arguments: --scan --stacktrace --warning-mode=all build
 
       - name: Deploy with Gradle
-        if: ${{ matrix.java == '8' }}
+        if: ${{ matrix.java == '17' }}
         uses: gradle/gradle-build-action@v2
         with:
           arguments: --scan publish -x check -Psigning.gnupg.executable=gpg -Psigning.gnupg.keyName=${{ secrets.GPG_NAME }} -Psigning.gnupg.passphrase=${{ secrets.GPG_PASSWORD }}

.github/workflows/pull-request.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: ['8', '11']
+        java: ['17']
     steps:
       - name: Checkout code
         uses: actions/checkout@v3

build.gradle

@@ -16,19 +16,19 @@ buildscript {
         // https://github.com/google/guava/releases
         guavaVersion = '32.1.2-jre'
         // https://github.com/protocolbuffers/protobuf/releases
-        protobufVersion = '3.23.4'
+        protobufVersion = '3.24.3'
         protobufGradlePluginVersion = '0.9.4'
 
         // https://github.com/spring-projects/spring-boot/releases
-        springBootVersion = '2.7.16'
+        springBootVersion = '3.1.4'
         // https://github.com/spring-cloud/spring-cloud-release/releases
-        springCloudVersion = '2021.0.8'
+        springCloudVersion = '2022.0.4'
         // https://github.com/alibaba/spring-cloud-alibaba/releases
         springCloudAlibabaNacosVersion = '2021.1'
 
         lombokPluginVersion = '8.1.0'
-        versioningPluginVersion = '2.15.1'
-        versionsPluginVersion = '0.47.0'
+        versioningPluginVersion = '3.0.0'
+        versionsPluginVersion = '0.48.0'
 
         // https://github.com/JetBrains/kotlin/releases
         kotlinVersion = "1.8.22"
@@ -44,7 +44,7 @@ plugins {
     id 'com.google.protobuf' version "${protobufGradlePluginVersion}"
     id 'io.freefair.lombok' version "${lombokPluginVersion}" apply false
     id 'com.github.ben-manes.versions' version "${versionsPluginVersion}" // gradle dependencyUpdates
-    id 'com.diffplug.spotless' version '6.13.0'
+    id 'com.diffplug.spotless' version '6.21.0'
     id 'org.jetbrains.kotlin.jvm' version "${kotlinVersion}" apply false
 }
 
@@ -60,8 +60,8 @@ 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 {
     // Update using:
-    // ./gradlew wrapper --gradle-version=7.5.1 --distribution-type=bin
-    gradleVersion = '7.6.2'
+    // ./gradlew wrapper --gradle-version=8.4 --distribution-type=bin
+    gradleVersion = '8.4'
 }
 
 def buildTimeAndDate = OffsetDateTime.now()
@@ -82,13 +82,13 @@ allprojects {
 
     java {
         toolchain {
-            languageVersion = JavaLanguageVersion.of(8)
+            languageVersion = JavaLanguageVersion.of(17)
         }
     }
 
     compileJava {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
         options.encoding = 'UTF-8'
     }
 
@@ -106,6 +106,7 @@ allprojects {
     spotless {
         java {
             target('src/main/**/*.java', 'src/test/**/*.java')
+            targetExclude('**/SocketUtils.java')
             licenseHeaderFile rootProject.file('extra/spotless/mit-license.java')
             removeUnusedImports()
             importOrderFile rootProject.file('extra/eclipse/eclipse.importorder')
@@ -168,12 +169,7 @@ allprojects {
 
 Project commonProject = project(':grpc-common-spring-boot')
 
-String javaAPIdoc
-if (JavaVersion.current().isJava9Compatible()) {
-    javaAPIdoc = 'https://docs.oracle.com/en/java/javase/11/docs/api'
-} else {
-    javaAPIdoc = 'https://docs.oracle.com/javase/8/docs/api/'
-}
+String javaAPIdoc =  'https://docs.oracle.com/en/java/javase/17/docs/api'
 
 allprojects { project ->
     buildscript {
@@ -196,6 +192,7 @@ allprojects { project ->
             springFrameworkVersion = dependencyManagement.importedProperties['spring-framework.version']
             springSecurityVersion = dependencyManagement.importedProperties['spring-security.version']
             springCloudCommonsVersion = dependencyManagement.importedProperties['spring-cloud-commons.version']
+            braveInstrumentationGrpc = dependencyManagement.importedProperties['brave.version']
         }
     }
 
@@ -249,8 +246,8 @@ allprojects { project ->
                     'https://docs.spring.io/spring-security/site/docs/' + springSecurityVersion + '/api/',
                     'https://docs.spring.io/spring-boot/docs/' + springBootVersion + '/api/',
                     'https://static.javadoc.io/org.springframework.cloud/spring-cloud-commons/' + springCloudCommonsVersion + '/',
-                    // 'https://static.javadoc.io/io.zipkin.brave/brave/' + braveInstrumentationGrpc + '/', // Requires javadoc 11
-                    // 'https://static.javadoc.io/io.zipkin.brave/brave-instrumentation-grpc/' + braveInstrumentationGrpc + '/', // Requires javadoc 11
+                    'https://static.javadoc.io/io.zipkin.brave/brave/' + braveInstrumentationGrpc + '/',
+                    'https://static.javadoc.io/io.zipkin.brave/brave-instrumentation-grpc/' + braveInstrumentationGrpc + '/',
                     'https://google.github.io/guava/releases/29.0-android/api/docs/'
             ]
         }

examples/grpc-lib/build.gradle

@@ -9,7 +9,8 @@ dependencies {
     if (JavaVersion.current().isJava9Compatible()) {
         // Workaround for @javax.annotation.Generated
         // see: https://github.com/grpc/grpc-java/issues/3633
-        implementation 'jakarta.annotation:jakarta.annotation-api'
+        compileOnly 'org.apache.tomcat:annotations-api:6.0.53'
+        annotationProcessor "jakarta.annotation:jakarta.annotation-api"
     }
 }
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,26 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew

@@ -15,8 +15,8 @@ dependencies {
 
     api project(':grpc-common-spring-boot')
     api 'org.springframework.boot:spring-boot-starter'
+    api 'jakarta.validation:jakarta.validation-api'
     optionalSupportImplementation 'org.springframework.boot:spring-boot-starter-actuator'
-    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'

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

@@ -31,7 +31,6 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.PreDestroy;
 import javax.annotation.concurrent.GuardedBy;
 
 import org.springframework.util.unit.DataSize;
@@ -44,6 +43,7 @@
 import io.grpc.ConnectivityState;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
+import jakarta.annotation.PreDestroy;
 import lombok.extern.slf4j.Slf4j;
 import net.devh.boot.grpc.client.config.GrpcChannelProperties;
 import net.devh.boot.grpc.client.config.GrpcChannelProperties.Security;