Merge branch 'master' into feature/keystoreSupport

Author: yidongnan

build.gradle

@@ -1,6 +1,5 @@
 import java.time.OffsetDateTime
 import java.time.format.DateTimeFormatter
-import io.franzbecker.gradle.lombok.task.DelombokTask
 
 buildscript {
     repositories {
@@ -29,7 +28,7 @@ buildscript {
         // https://github.com/spring-projects/spring-security-oauth/releases
         springSecurityOAuthVersion = '2.5.1.RELEASE'
 
-        lombokPluginVersion = '5.0.0'
+        lombokPluginVersion = '6.3.0'
         versioningPluginVersion = '2.15.1'
         versionsPluginVersion = '0.39.0'
     }
@@ -42,7 +41,7 @@ plugins {
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     id 'net.nemerosa.versioning' version "${versioningPluginVersion}"
     id 'com.google.protobuf' version "${protobufGradlePluginVersion}"
-    id 'io.franzbecker.gradle-lombok' version "${lombokPluginVersion}" apply false
+    id 'io.freefair.lombok' version "${lombokPluginVersion}" apply false
     id 'com.github.ben-manes.versions' version "${versionsPluginVersion}" // gradle dependencyUpdates
     id 'com.diffplug.spotless' version '6.0.0'
 }
@@ -77,7 +76,7 @@ allprojects {
     apply plugin: 'eclipse'
     apply plugin: 'io.spring.dependency-management'
     apply plugin: 'com.diffplug.spotless'
-    apply plugin: 'io.franzbecker.gradle-lombok'
+    apply plugin: 'io.freefair.lombok'
 
     java {
         toolchain {
@@ -218,17 +217,6 @@ allprojects { project ->
     }
 
     if (project.name == 'grpc-common-spring-boot' || project.name == 'grpc-client-spring-boot-autoconfigure' || project.name == 'grpc-server-spring-boot-autoconfigure') {
-        // Properly generate javadocs for the important projects
-
-        task delombok(type: DelombokTask, dependsOn: compileJava) {
-            ext.outputDir = file("$buildDir/delombok")
-            outputs.dir(outputDir)
-            sourceSets.main.java.srcDirs.each {
-                inputs.dir(it)
-                args(it, '-d', outputDir)
-            }
-        }
-
         java {
             registerFeature('optionalSupport') {
                 usingSourceSet(sourceSets.main)
@@ -241,7 +229,7 @@ allprojects { project ->
             if (project.name != 'grpc-common-spring-boot') {
                 dependsOn(":grpc-common-spring-boot:javadoc")
             }
-            source = delombok.outputDir
+            source = delombok
             failOnError = false
             options.locale = 'en_US'
             options.encoding = 'UTF-8'

docs/en/client/configuration.md

@@ -328,6 +328,13 @@ you have to define it via spring context (unless you wish to use `static`).
 > **Note:** `NameResolverProvider`s are registered gloablly, so might run into issues if you boot up two or more
 > applications simulataneosly in the same JVM (e.g. during tests).
 
+## HealthIndicator
+
+This library automatically provides a `grpcChannel` `HealthIndicator` (actuator/health) for all clients (shared).
+It will report the service as `OUT_OF_SERVICE` if any client has the `TRANSIENT_FAILURE` status.
+If you wish to exclude it and provide more specific `HealthIndicator`s,
+you can disable it by excluding the `GrpcClientHealthAutoConfiguration`
+
 ## Additional Topics <!-- omit in toc -->
 
 - [Getting Started](getting-started.md)

docs/en/client/getting-started.md

@@ -100,7 +100,7 @@ This section assumes that you have already defined and generated your [Protobuf
 ### Explaining the Client Components
 
 The following list contains all features that you might encounter on the client side.
-If you don't wish to use any advanced features, then the first element is probably all you need to use.
+If you don't wish to use any advanced features, then the first two elements are probably all you need to use.
 
 - [`@GrpcClient`](https://javadoc.io/page/net.devh/grpc-client-spring-boot-autoconfigure/latest/net/devh/boot/grpc/client/inject/GrpcClient.html):
   The annotation that marks fields and setters for auto injection of clients.

docs/en/server/getting-started.md

@@ -46,9 +46,9 @@ We recommend splitting your project into 2-3 separate modules.
 
 ````xml
     <properties>
-        <protobuf.version>3.14.0</protobuf.version>
+        <protobuf.version>3.19.1</protobuf.version>
         <protobuf-plugin.version>0.6.1</protobuf-plugin.version>
-        <grpc.version>1.35.0</grpc.version>
+        <grpc.version>1.42.1</grpc.version>
     </properties>
 
     <dependencies>
@@ -76,7 +76,7 @@ We recommend splitting your project into 2-3 separate modules.
             <extension>
                 <groupId>kr.motd.maven</groupId>
                 <artifactId>os-maven-plugin</artifactId>
-                <version>1.6.2</version>
+                <version>1.7.0</version>
             </extension>
         </extensions>
 
@@ -108,9 +108,9 @@ We recommend splitting your project into 2-3 separate modules.
 ````gradle
 buildscript {
     ext {
-        protobufVersion = '3.14.0'
-        protobufPluginVersion = '0.8.14'
-        grpcVersion = '1.35.0'
+        protobufVersion = '3.19.1'
+        protobufPluginVersion = '0.8.18'
+        grpcVersion = '1.42.1'
     }
 }