From 0ebb1c5baabd280c1587e3be83c223e951f76133 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 14 Dec 2021 16:48:40 +0100 Subject: [PATCH] Upgrade to Tomcat 9.0.56, Undertow 2.2.14, Apache HttpClient 5.1.2 & HttpAsyncClient 4.1.5, Mockito 4.1 --- build.gradle | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index e1cd581786a..992aa6391a2 100644 --- a/build.gradle +++ b/build.gradle @@ -128,41 +128,41 @@ configure(allprojects) { project -> dependency "org.webjars:webjars-locator-core:0.48" dependency "org.webjars:underscorejs:1.8.3" - dependencySet(group: 'org.apache.tomcat', version: '9.0.55') { + dependencySet(group: 'org.apache.tomcat', version: '9.0.56') { entry 'tomcat-util' entry('tomcat-websocket') { - exclude group: "org.apache.tomcat", name: "tomcat-websocket-api" exclude group: "org.apache.tomcat", name: "tomcat-servlet-api" + exclude group: "org.apache.tomcat", name: "tomcat-websocket-api" } } - dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.55') { + dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.56') { entry 'tomcat-embed-core' entry 'tomcat-embed-websocket' } - dependencySet(group: 'io.undertow', version: '2.2.13.Final') { + dependencySet(group: 'io.undertow', version: '2.2.14.Final') { entry 'undertow-core' - entry('undertow-websockets-jsr') { - exclude group: "org.jboss.spec.javax.websocket", name: "jboss-websocket-api_1.1_spec" - } entry('undertow-servlet') { exclude group: "org.jboss.spec.javax.servlet", name: "jboss-servlet-api_4.0_spec" exclude group: "org.jboss.spec.javax.annotation", name: "jboss-annotations-api_1.3_spec" } + entry('undertow-websockets-jsr') { + exclude group: "org.jboss.spec.javax.websocket", name: "jboss-websocket-api_1.1_spec" + } } - dependencySet(group: 'com.squareup.okhttp3', version: '3.14.9') { - entry 'okhttp' - entry 'mockwebserver' - } + dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.9" + dependency 'org.apache.httpcomponents.client5:httpclient5:5.1.2' + dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.2' dependency("org.apache.httpcomponents:httpclient:4.5.13") { exclude group: "commons-logging", name: "commons-logging" } - dependency("org.apache.httpcomponents:httpasyncclient:4.1.4") { + dependency("org.apache.httpcomponents:httpasyncclient:4.1.5") { exclude group: "commons-logging", name: "commons-logging" } - dependency 'org.apache.httpcomponents.client5:httpclient5:5.1' - dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.1' - dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.9" + dependencySet(group: 'com.squareup.okhttp3', version: '3.14.9') { + entry 'okhttp' + entry 'mockwebserver' + } dependency "org.jruby:jruby:9.2.20.1" dependency "org.python:jython-standalone:2.7.1" @@ -198,7 +198,7 @@ configure(allprojects) { project -> exclude group: "org.hamcrest", name: "hamcrest-core" } } - dependencySet(group: 'org.mockito', version: '4.0.0') { + dependencySet(group: 'org.mockito', version: '4.1.0') { entry('mockito-core') { exclude group: "org.hamcrest", name: "hamcrest-core" }