Skip to content

Commit de1c351

Browse files
committed
Merge remote-tracking branch 'origin/4.1.x'
2 parents ffd0c37 + 013e00c commit de1c351

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"dependencies": {
33
"antora": "3.2.0-alpha.6",
44
"@antora/atlas-extension": "1.0.0-alpha.2",
5-
"@antora/collector-extension": "1.0.0-beta.2",
5+
"@antora/collector-extension": "1.0.0-beta.3",
66
"@asciidoctor/tabs": "1.0.0-beta.6",
77
"@springio/antora-extensions": "1.14.2",
88
"@springio/asciidoctor-extensions": "1.0.0-alpha.14"

spring-cloud-openfeign-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
<dependency>
190190
<groupId>io.vavr</groupId>
191191
<artifactId>vavr</artifactId>
192-
<version>0.10.4</version>
192+
<version>0.10.5</version>
193193
<scope>test</scope>
194194
</dependency>
195195
<dependency>

src/checkstyle/checkstyle-suppressions.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
<suppress files=".*Hello.*" checks="RedundantModifier"/>
1515
<suppress files=".*test.*" checks="JavadocStyle"/>
1616
<suppress files=".*test.*" checks="JavadocVariable"/>
17+
<suppress files="[\\/]src[\\/](test|testFixtures)[\\/](java|java21)[\\/]" checks="RegexpSinglelineJava" id="toLowerCaseWithoutLocale"/>
18+
<suppress files="[\\/]src[\\/](test|testFixtures)[\\/](java|java21)[\\/]" checks="RegexpSinglelineJava" id="toUpperCaseWithoutLocale"/>
1719
<!-- Important -->
1820
<suppress files=".*HttpEncoding.*" checks="InterfaceIsTypeCheck" />
1921
</suppressions>

0 commit comments

Comments
 (0)