diff --git a/build.gradle b/build.gradle index 8039329a4dd..67cae273b7c 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ ext { !it.name.equals("spring-build-src") && !it.name.equals("spring-framework-bom") } - aspectjVersion = "1.8.13" + aspectjVersion = "1.8.14" freemarkerVersion = "2.3.28" groovyVersion = "2.4.16" hsqldbVersion = "2.4.1" diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle index a3e43ff50fe..95fa19eed65 100644 --- a/spring-test/spring-test.gradle +++ b/spring-test/spring-test.gradle @@ -71,7 +71,7 @@ dependencies { testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4J) testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4J) testCompile("org.hsqldb:hsqldb:${hsqldbVersion}") - testCompile("org.apache.httpcomponents:httpclient:4.5.7") { + testCompile("org.apache.httpcomponents:httpclient:4.5.8") { exclude group: "commons-logging", module: "commons-logging" } testCompile("io.projectreactor.ipc:reactor-netty") diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index 26253aa8b1d..0b8c2aa83fc 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -37,7 +37,7 @@ dependencies { exclude group: "javax.servlet", module: "javax.servlet-api" } optional("com.squareup.okhttp3:okhttp:3.12.2") - optional("org.apache.httpcomponents:httpclient:4.5.7") { + optional("org.apache.httpcomponents:httpclient:4.5.8") { exclude group: "commons-logging", module: "commons-logging" } optional("org.apache.httpcomponents:httpasyncclient:4.1.4") { diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index d1164c00407..60bfcca8650 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -33,7 +33,7 @@ dependencies { optional("io.undertow:undertow-websockets-jsr:${undertowVersion}") { exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.1_spec" } - optional("org.apache.httpcomponents:httpclient:4.5.7") { + optional("org.apache.httpcomponents:httpclient:4.5.8") { exclude group: "commons-logging", module: "commons-logging" } optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}") diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle index 7e1013d637a..5056645e65e 100644 --- a/spring-webmvc/spring-webmvc.gradle +++ b/spring-webmvc/spring-webmvc.gradle @@ -49,7 +49,7 @@ dependencies { testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}") { exclude group: "javax.servlet", module: "javax.servlet" } - testCompile("org.apache.httpcomponents:httpclient:4.5.7") { + testCompile("org.apache.httpcomponents:httpclient:4.5.8") { exclude group: "commons-logging", module: "commons-logging" } testCompile("commons-fileupload:commons-fileupload:1.3.3")