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

@@ -20,7 +20,7 @@ buildscript {
         protobufGradlePluginVersion = '0.9.4'
 
         // https://github.com/spring-projects/spring-boot/releases
-        springBootVersion = '2.7.16'
+        springBootVersion = '3.1.3'
         // https://github.com/spring-cloud/spring-cloud-release/releases
         springCloudVersion = '2021.0.8'
         // https://github.com/alibaba/spring-cloud-alibaba/releases
@@ -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')

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"
     }
 }
 

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

@@ -15,6 +15,7 @@ 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'

grpc-client-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/client/channelfactory/AbstractChannelFactory.java

@@ -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;

grpc-client-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/client/inject/GrpcClientBeanPostProcessor.java

@@ -26,8 +26,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-
 import org.springframework.beans.BeanInstantiationException;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.InvalidPropertyException;
@@ -47,6 +45,7 @@
 import io.grpc.Channel;
 import io.grpc.ClientInterceptor;
 import io.grpc.stub.AbstractStub;
+import jakarta.annotation.PostConstruct;
 import net.devh.boot.grpc.client.channelfactory.GrpcChannelFactory;
 import net.devh.boot.grpc.client.nameresolver.NameResolverRegistration;
 import net.devh.boot.grpc.client.stubfactory.FallbackStubFactory;

grpc-client-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/client/inject/GrpcClientConstructorInjectionBeanFactoryPostProcessor.java

@@ -23,14 +23,14 @@
 import java.lang.reflect.Parameter;
 import java.util.Arrays;
 
-import javax.validation.constraints.NotNull;
-
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 
+import jakarta.validation.constraints.NotNull;
+
 /**
  * {@link BeanFactoryPostProcessor} that searches the bean definitions for {@link GrpcClient} annotations on
  * constructors and factory methods.

grpc-client-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/client/nameresolver/DiscoveryClientResolverFactory.java

@@ -24,7 +24,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.annotation.Nullable;
-import javax.annotation.PreDestroy;
 
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
@@ -36,6 +35,7 @@
 import io.grpc.NameResolver;
 import io.grpc.NameResolverProvider;
 import io.grpc.internal.GrpcUtil;
+import jakarta.annotation.PreDestroy;
 
 /**
  * A name resolver factory that will create a {@link DiscoveryClientNameResolver} based on the target uri.