Skip to content

Commit 5c718a0

Browse files
authored
Merge branch 'master' into support-AuthenticationManagerResolver
2 parents a5904ab + 2285522 commit 5c718a0

File tree

22 files changed

+350
-77
lines changed

22 files changed

+350
-77
lines changed

.github/workflows/build-master.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ jobs:
3030
run: openssl aes-256-cbc -K ${{ secrets.ENCRYPTED_KEY }} -iv ${{ secrets.ENCRYPTED_IV }} -in private.key.enc -out ./private.key -d && gpg --batch --import ./private.key || echo
3131

3232
- name: Build with Gradle
33-
uses: gradle/gradle-build-action@v2
33+
uses: gradle/actions/setup-gradle@v3
3434
with:
3535
arguments: --scan --stacktrace --warning-mode=all build
3636

3737
- name: Deploy with Gradle
3838
if: ${{ matrix.java == '17' }}
39-
uses: gradle/gradle-build-action@v2
39+
uses: gradle/actions/setup-gradle@v3
4040
with:
4141
arguments: --scan publish -x check -Psigning.gnupg.executable=gpg -Psigning.gnupg.keyName=${{ secrets.GPG_NAME }} -Psigning.gnupg.passphrase=${{ secrets.GPG_PASSWORD }}
4242
env:

.github/workflows/pull-request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424
check-latest: true
2525

2626
- name: Build with Gradle
27-
uses: gradle/gradle-build-action@v2
27+
uses: gradle/actions/setup-gradle@v3
2828
with:
2929
arguments: --scan --stacktrace --warning-mode=all build
3030

3131
# Avoid publish errors when upgrading gradle version and dependencyManager plugin
3232
- name: Try publishToMavenLocal
33-
uses: gradle/gradle-build-action@v2
33+
uses: gradle/actions/setup-gradle@v3
3434
with:
3535
arguments: publishToMavenLocal

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript {
1111
projectVersion = '3.0.0.RELEASE'
1212

1313
// https://github.com/grpc/grpc-java/releases
14-
grpcVersion = '1.60.1'
14+
grpcVersion = '1.63.0'
1515

1616
// https://github.com/google/guava/releases
1717
guavaVersion = '33.1.0-jre'
@@ -61,7 +61,7 @@ if (hasProperty('buildScan')) {
6161
wrapper {
6262
// Update using:
6363
// ./gradlew wrapper --gradle-version=8.4 --distribution-type=bin
64-
gradleVersion = '8.6'
64+
gradleVersion = '8.7'
6565
}
6666

6767
def buildTimeAndDate = OffsetDateTime.now()

docs/en/client/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ There are a number of supported schemes, that you can use to determine the targe
6969
- `discovery` (Prio 6): \
7070
(Optional) Uses spring-cloud's `DiscoveryClient` to lookup appropriate targets. The connections will be refreshed
7171
automatically during `HeartbeatEvent`s. Uses the `gRPC_port` metadata to determine the port, otherwise uses the
72-
service port. \
72+
service port. Uses the `gRPC_service_config` metadata to determine [service config](https://grpc.github.io/grpc/core/md_doc_service_config.html). \
7373
Example: `discovery:///service-name`
7474
- `self` (Prio 0): \
7575
The self address or scheme is a keyword that is available, if you also use `grpc-server-spring-boot-starter` and

docs/en/client/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ This section deals with how to get Spring to connect to a grpc server and manage
2626

2727
Before we start adding the dependencies lets start with some of our recommendation for your project setup.
2828

29-
![project setup](/grpc-spring-boot-starter/assets/images/client-project-setup.svg)
29+
![project setup](/grpc-spring/assets/images/client-project-setup.svg)
3030

3131
We recommend splitting your project into 2-3 separate modules.
3232

docs/en/server/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ This section describes the steps necessary to convert your application into a gr
2828

2929
Before we start adding the dependencies lets start with some of our recommendation for your project setup.
3030

31-
![project setup](/grpc-spring-boot-starter/assets/images/server-project-setup.svg)
31+
![project setup](/grpc-spring/assets/images/server-project-setup.svg)
3232

3333
We recommend splitting your project into 2-3 separate modules.
3434

docs/zh-CN/client/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
在我们开始添加依赖关系之前,让我们项目的一些设置建议开始。
2828

29-
![项目创建](/grpc-spring-boot-starter/assets/images/client-project-setup.svg)
29+
![项目创建](/grpc-spring/assets/images/client-project-setup.svg)
3030

3131
我们建议将您的项目分为2至3个不同的模块。
3232

docs/zh-CN/server/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
在我们开始添加依赖关系之前,让我们项目的一些设置建议开始。
3030

31-
![项目创建](/grpc-spring-boot-starter/assets/images/server-project-setup.svg)
31+
![项目创建](/grpc-spring/assets/images/server-project-setup.svg)
3232

3333
我们建议将您的项目分为2至3个不同的模块。
3434

gradle/wrapper/gradle-wrapper.jar

-9 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)