Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.3.x'

Browse Source 
# Conflicts:
#	build.gradle
This commit is contained in:
Juergen Hoeller
2022-02-04 23:55:18 +01:00
parent 3eb9886724 5bbdd36e19
commit b0bca7f5ae
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@@ -134,8 +134,8 @@ configure(allprojects) { project ->
}
dependency "org.eclipse.jetty:jetty-reactive-httpclient:3.0.4"
dependency 'org.apache.httpcomponents.client5:httpclient5:5.1.2'
dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.2'
dependency 'org.apache.httpcomponents.client5:httpclient5:5.1.3'
dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.3'
dependency("org.apache.httpcomponents:httpclient:4.5.13") {
exclude group: "commons-logging", name: "commons-logging"
}
@@ -184,10 +184,10 @@ configure(allprojects) { project ->
}
dependency "io.mockk:mockk:1.12.1"
dependency("net.sourceforge.htmlunit:htmlunit:2.57.0") {
dependency("net.sourceforge.htmlunit:htmlunit:2.58.0") {
exclude group: "commons-logging", name: "commons-logging"
}
dependency("org.seleniumhq.selenium:htmlunit-driver:2.56.0") {
dependency("org.seleniumhq.selenium:htmlunit-driver:2.58.0") {
exclude group: "commons-logging", name: "commons-logging"
}
dependency("org.seleniumhq.selenium:selenium-java:3.141.59") {
@@ -297,7 +297,7 @@ configure([rootProject] + javaProjects) { project ->
}
checkstyle {
toolVersion = "9.2.1"
toolVersion = "9.3"
configDirectory.set(rootProject.file("src/checkstyle"))
}