diff --git a/build.gradle b/build.gradle index ed78274509f..3a915403f34 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ configure(allprojects) { project -> dependencyManagement { imports { mavenBom "com.fasterxml.jackson:jackson-bom:2.11.3" - mavenBom "io.netty:netty-bom:4.1.52.Final" + mavenBom "io.netty:netty-bom:4.1.53.Final" mavenBom "io.projectreactor:reactor-bom:2020.0.0-RC2" mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR7" mavenBom "io.rsocket:rsocket-bom:1.1.0-RC1" @@ -39,8 +39,8 @@ configure(allprojects) { project -> dependencySet(group: 'org.apache.logging.log4j', version: '2.13.3') { entry 'log4j-api' entry 'log4j-core' - entry 'log4j-slf4j-impl' entry 'log4j-jul' + entry 'log4j-slf4j-impl' } dependency "org.slf4j:slf4j-api:1.7.30" dependency("com.google.code.findbugs:findbugs:3.0.1") { @@ -128,14 +128,14 @@ configure(allprojects) { project -> dependency "org.webjars:webjars-locator-core:0.46" dependency "org.webjars:underscorejs:1.8.3" - dependencySet(group: 'org.apache.tomcat', version: '9.0.38') { + dependencySet(group: 'org.apache.tomcat', version: '9.0.39') { entry 'tomcat-util' entry('tomcat-websocket') { exclude group: "org.apache.tomcat", name: "tomcat-websocket-api" exclude group: "org.apache.tomcat", name: "tomcat-servlet-api" } } - dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.38') { + dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.39') { entry 'tomcat-embed-core' entry 'tomcat-embed-websocket' } @@ -161,7 +161,7 @@ configure(allprojects) { project -> exclude group: "commons-logging", name: "commons-logging" } dependency 'org.apache.httpcomponents.client5:httpclient5:5.0.3' - dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.0.3' + dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.0.2' dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.4" dependency "org.jruby:jruby:9.2.13.0" diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index 4385243042e..3745b5201ba 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -35,8 +35,8 @@ dependencies { exclude group: "javax.servlet", module: "javax.servlet-api" } optional("org.eclipse.jetty:jetty-reactive-httpclient") - optional('org.apache.httpcomponents.client5:httpclient5:5.0') - optional('org.apache.httpcomponents.core5:httpcore5-reactive:5.0') + optional('org.apache.httpcomponents.client5:httpclient5') + optional('org.apache.httpcomponents.core5:httpcore5-reactive') optional("com.squareup.okhttp3:okhttp") optional("org.apache.httpcomponents:httpclient") optional("org.apache.httpcomponents:httpasyncclient") diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index f7ef1aa64cd..c793b31804e 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -43,8 +43,8 @@ dependencies { testCompile("org.eclipse.jetty:jetty-server") testCompile("org.eclipse.jetty:jetty-servlet") testCompile("org.eclipse.jetty:jetty-reactive-httpclient") - testCompile('org.apache.httpcomponents.client5:httpclient5:5.0') - testCompile('org.apache.httpcomponents.core5:httpcore5-reactive:5.0') + testCompile('org.apache.httpcomponents.client5:httpclient5') + testCompile('org.apache.httpcomponents.core5:httpcore5-reactive') testCompile("com.squareup.okhttp3:mockwebserver") testCompile("org.jetbrains.kotlin:kotlin-script-runtime") testRuntime("org.jetbrains.kotlin:kotlin-scripting-jsr223")