Skip to content

Commit eca3b0b

Browse files
committed
Merge remote-tracking branch 'origin/4.1.x'
2 parents 79b81dd + f832b10 commit eca3b0b

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

docs/modules/ROOT/partials/_configprops.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
|spring.cloud.openfeign.client.default-config | `+++default+++` |
7474
|spring.cloud.openfeign.client.default-to-properties | `+++true+++` |
7575
|spring.cloud.openfeign.client.refresh-enabled | `+++false+++` | Enables options value refresh capability for Feign.
76+
|spring.cloud.openfeign.compression.request.content-encoding-types | | The list of content encodings (applicable encodings depend on the used client).
7677
|spring.cloud.openfeign.compression.request.enabled | `+++false+++` | Enables the request sent by Feign to be compressed.
7778
|spring.cloud.openfeign.compression.request.mime-types | `+++[text/xml, application/xml, application/json]+++` | The list of supported mime types.
7879
|spring.cloud.openfeign.compression.request.min-request-size | `+++2048+++` | The minimum threshold content size.

docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
"@antora/collector-extension": "1.0.0-beta.2",
66
"@asciidoctor/tabs": "1.0.0-beta.6",
77
"@springio/antora-extensions": "1.14.2",
8-
"@springio/asciidoctor-extensions": "1.0.0-alpha.13"
8+
"@springio/asciidoctor-extensions": "1.0.0-alpha.14"
99
}
1010
}

spring-cloud-openfeign-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
<dependency>
184184
<groupId>com.google.protobuf</groupId>
185185
<artifactId>protobuf-java</artifactId>
186-
<version>3.25.4</version>
186+
<version>3.25.5</version>
187187
<scope>test</scope>
188188
</dependency>
189189
<dependency>

spring-cloud-openfeign-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<name>spring-cloud-openfeign-dependencies</name>
1616
<description>Spring Cloud OpenFeign Dependencies</description>
1717
<properties>
18-
<feign.version>13.3</feign.version>
18+
<feign.version>13.4</feign.version>
1919
<feign-form.version>3.8.0</feign-form.version>
2020
</properties>
2121
<dependencyManagement>

0 commit comments

Comments
 (0)