Skip to content

Commit c0915af

Browse files
committed
Merge remote-tracking branch 'origin/4.1.x' into 4.1.x
2 parents b03516a + 027a7b7 commit c0915af

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</scm>
2626
<properties>
2727
<main.basedir>${basedir}</main.basedir>
28-
<jackson.version>2.17.1</jackson.version>
28+
<jackson.version>2.17.2</jackson.version>
2929
<spring-cloud-commons.version>4.1.5-SNAPSHOT</spring-cloud-commons.version>
3030

3131
<!-- Plugin versions -->

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.3</version>
186+
<version>3.25.4</version>
187187
<scope>test</scope>
188188
</dependency>
189189
<dependency>

spring-cloud-openfeign-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"name": "spring.cloud.openfeign.circuitbreaker.alphanumeric-ids.enabled",
2525
"type": "java.lang.Boolean",
2626
"description": "If true, Circuit Breaker ids will only contain alphanumeric characters to allow for configuration via configuration properties.",
27-
"defaultValue": "false"
27+
"defaultValue": "true"
2828
},
2929
{
3030
"name": "spring.cloud.openfeign.httpclient.hc5.enabled",

0 commit comments

Comments
 (0)