Skip to content

Commit

Permalink
Merge branch '5.3.x'
Browse files Browse the repository at this point in the history
# Conflicts:
#	build.gradle
#	spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
#	spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
#	spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java
#	spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletResponse.java
  • Loading branch information
jhoeller committed Nov 10, 2022
2 parents 1443669 + d7d44c6 commit 0e4ab2c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ configure([rootProject] + javaProjects) { project ->
}

checkstyle {
toolVersion = "10.3.4"
toolVersion = "10.4"
configDirectory.set(rootProject.file("src/checkstyle"))
}

Expand Down

0 comments on commit 0e4ab2c

Please sign in to comment.