From 5d919dc094a25c07a4aecb70fbca88292f4b20fb Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 28 Jun 2021 14:25:55 +0200 Subject: [PATCH] Upgrade to Tomcat 9.0.48, Jetty 9.4.42, Jetty Reactive HttpClient 1.1.9, JRuby 9.2.19, Protobuf 3.17.3, SnakeYAML 1.29, WebJars Locator 0.47, AssertJ 3.20.2, Mockito 3.11.2, Checkstyle 8.44 --- build.gradle | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 6ff1cdab9dd..2b09037d0a9 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ configure(allprojects) { project -> mavenBom "io.projectreactor:reactor-bom:2020.0.8" mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10" mavenBom "io.rsocket:rsocket-bom:1.1.1" - mavenBom "org.eclipse.jetty:jetty-bom:9.4.41.v20210516" + mavenBom "org.eclipse.jetty:jetty-bom:9.4.42.v20210604" mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.10" mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.0" mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.1" @@ -76,7 +76,7 @@ configure(allprojects) { project -> exclude group: "stax", name: "stax-api" } dependency "com.google.code.gson:gson:2.8.7" - dependency "com.google.protobuf:protobuf-java-util:3.17.2" + dependency "com.google.protobuf:protobuf-java-util:3.17.3" dependency "com.googlecode.protobuf-java-format:protobuf-java-format:1.4" dependency("com.thoughtworks.xstream:xstream:1.4.17") { exclude group: "xpp3", name: "xpp3_min" @@ -91,7 +91,7 @@ configure(allprojects) { project -> entry 'jibx-run' } dependency "org.ogce:xpp3:1.1.6" - dependency "org.yaml:snakeyaml:1.28" + dependency "org.yaml:snakeyaml:1.29" dependency "com.h2database:h2:1.4.200" dependency "com.github.ben-manes.caffeine:caffeine:2.9.1" @@ -124,17 +124,17 @@ configure(allprojects) { project -> dependency "org.ehcache:ehcache:3.4.0" dependency "org.hibernate:hibernate-core:5.4.32.Final" dependency "org.hibernate:hibernate-validator:6.2.0.Final" - dependency "org.webjars:webjars-locator-core:0.46" + dependency "org.webjars:webjars-locator-core:0.47" dependency "org.webjars:underscorejs:1.8.3" - dependencySet(group: 'org.apache.tomcat', version: '9.0.45') { + dependencySet(group: 'org.apache.tomcat', version: '9.0.48') { 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.45') { + dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.48') { entry 'tomcat-embed-core' entry 'tomcat-embed-websocket' } @@ -161,9 +161,9 @@ configure(allprojects) { project -> } 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.8" + dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.9" - dependency "org.jruby:jruby:9.2.17.0" + dependency "org.jruby:jruby:9.2.19.0" dependency "org.python:jython-standalone:2.7.1" dependency "org.mozilla:rhino:1.7.11" @@ -189,14 +189,14 @@ configure(allprojects) { project -> dependency "org.testng:testng:7.4.0" dependency "org.hamcrest:hamcrest:2.1" dependency "org.awaitility:awaitility:3.1.6" - dependency "org.assertj:assertj-core:3.19.0" + dependency "org.assertj:assertj-core:3.20.2" dependencySet(group: 'org.xmlunit', version: '2.8.2') { entry 'xmlunit-assertj' entry('xmlunit-matchers') { exclude group: "org.hamcrest", name: "hamcrest-core" } } - dependencySet(group: 'org.mockito', version: '3.11.0') { + dependencySet(group: 'org.mockito', version: '3.11.2') { entry('mockito-core') { exclude group: "org.hamcrest", name: "hamcrest-core" } @@ -336,7 +336,7 @@ configure([rootProject] + javaProjects) { project -> } checkstyle { - toolVersion = "8.43" + toolVersion = "8.44" configDirectory.set(rootProject.file("src/checkstyle")) }