From 2ee393ae712c8a141c919051a1479a04457fea85 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 23 Dec 2022 15:52:09 +0100 Subject: [PATCH] Upgrade to Tomcat 9.0.70, Jetty 9.4.50, Netty 4.1.86, Undertow 2.2.22, HtmlUnit 2.67, Mockito 4.9, AssertJ 3.23.1, Checkstyle 10.5 --- build.gradle | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index dbc25c94dca..3e63f87bcac 100644 --- a/build.gradle +++ b/build.gradle @@ -28,11 +28,11 @@ configure(allprojects) { project -> dependencyManagement { imports { mavenBom "com.fasterxml.jackson:jackson-bom:2.12.7" - mavenBom "io.netty:netty-bom:4.1.85.Final" + mavenBom "io.netty:netty-bom:4.1.86.Final" mavenBom "io.projectreactor:reactor-bom:2020.0.25" mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR13" mavenBom "io.rsocket:rsocket-bom:1.1.3" - mavenBom "org.eclipse.jetty:jetty-bom:9.4.49.v20220914" + mavenBom "org.eclipse.jetty:jetty-bom:9.4.50.v20221201" mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.32" mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2" mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.2" @@ -128,18 +128,18 @@ 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.68') { + dependencySet(group: 'org.apache.tomcat', version: '9.0.70') { entry 'tomcat-util' entry('tomcat-websocket') { 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.68') { + dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.70') { entry 'tomcat-embed-core' entry 'tomcat-embed-websocket' } - dependencySet(group: 'io.undertow', version: '2.2.21.Final') { + dependencySet(group: 'io.undertow', version: '2.2.22.Final') { entry 'undertow-core' entry('undertow-servlet') { exclude group: "org.jboss.spec.javax.servlet", name: "jboss-servlet-api_4.0_spec" @@ -191,14 +191,14 @@ configure(allprojects) { project -> dependency "org.junit.support:testng-engine:1.0.4" dependency "org.hamcrest:hamcrest:2.2" dependency "org.awaitility:awaitility:3.1.6" - dependency "org.assertj:assertj-core:3.23.0" + dependency "org.assertj:assertj-core:3.23.1" dependencySet(group: 'org.xmlunit', version: '2.9.0') { entry 'xmlunit-assertj' entry('xmlunit-matchers') { exclude group: "org.hamcrest", name: "hamcrest-core" } } - dependencySet(group: 'org.mockito', version: '4.8.1') { + dependencySet(group: 'org.mockito', version: '4.9.0') { entry('mockito-core') { exclude group: "org.hamcrest", name: "hamcrest-core" } @@ -206,10 +206,10 @@ configure(allprojects) { project -> } dependency "io.mockk:mockk:1.12.1" - dependency("net.sourceforge.htmlunit:htmlunit:2.66.0") { + dependency("net.sourceforge.htmlunit:htmlunit:2.67.0") { exclude group: "commons-logging", name: "commons-logging" } - dependency("org.seleniumhq.selenium:htmlunit-driver:2.66.0") { + dependency("org.seleniumhq.selenium:htmlunit-driver:2.67.0") { exclude group: "commons-logging", name: "commons-logging" } dependency("org.seleniumhq.selenium:selenium-java:3.141.59") { @@ -340,7 +340,7 @@ configure([rootProject] + javaProjects) { project -> } checkstyle { - toolVersion = "10.4" + toolVersion = "10.5.0" configDirectory.set(rootProject.file("src/checkstyle")) }