Skip to content

Commit 9ad6708

Browse files
Upgrade to feign 13.0 (#931)
1 parent 942cc69 commit 9ad6708

File tree

5 files changed

+6
-4
lines changed

5 files changed

+6
-4
lines changed

docs/modules/ROOT/partials/_configprops.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@
6060
|spring.cloud.loadbalancer.retry.retryable-status-codes | `+++{}+++` | A `Set` of status codes that should trigger a retry.
6161
|spring.cloud.loadbalancer.sticky-session.add-service-instance-cookie | `+++false+++` | Indicates whether a cookie with the newly selected instance should be added by LoadBalancer.
6262
|spring.cloud.loadbalancer.sticky-session.instance-id-cookie-name | `+++sc-lb-instance-id+++` | The name of the cookie holding the preferred instance id.
63+
|spring.cloud.loadbalancer.subset.instance-id | | Instance id of deterministic subsetting. If not set, {@link IdUtils#getDefaultInstanceId(PropertyResolver)} will be used.
64+
|spring.cloud.loadbalancer.subset.size | `+++100+++` | Max subset size of deterministic subsetting.
6365
|spring.cloud.loadbalancer.x-forwarded.enabled | `+++false+++` | To Enable X-Forwarded Headers.
6466
|spring.cloud.openfeign.autoconfiguration.jackson.enabled | `+++true+++` | If true, PageJacksonModule and SortJacksonModule bean will be provided for Jackson page decoding.
6567
|spring.cloud.openfeign.circuitbreaker.alphanumeric-ids.enabled | `+++false+++` | If true, Circuit Breaker ids will only contain alphanumeric characters to allow for configuration via configuration properties.

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<!-- Plugin versions -->
3232
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
3333
<!-- Sonar -->
34-
<surefire.plugin.version>2.19.1</surefire.plugin.version>
34+
<surefire.plugin.version>3.2.2</surefire.plugin.version>
3535
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
3636
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
3737
<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec

spring-cloud-openfeign-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
<dependency>
188188
<groupId>com.google.protobuf</groupId>
189189
<artifactId>protobuf-java</artifactId>
190-
<version>3.19.6</version>
190+
<version>3.25.0</version>
191191
<scope>test</scope>
192192
</dependency>
193193
<dependency>

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientUsingPropertiesTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ public void apply(RequestTemplate template) {
429429
public static class BazResponseInterceptor implements ResponseInterceptor {
430430

431431
@Override
432-
public Object aroundDecode(InvocationContext invocationContext) {
432+
public Object intercept(InvocationContext invocationContext, Chain chain) throws Exception {
433433
return "baz";
434434
}
435435

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>12.5</feign.version>
18+
<feign.version>13.0</feign.version>
1919
<feign-form.version>3.8.0</feign-form.version>
2020
</properties>
2121
<dependencyManagement>

0 commit comments

Comments
 (0)