From e5a69dcfdfbf5582ce4d719ed891677132ec281e Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 12 Mar 2024 20:07:58 +0100 Subject: [PATCH] Upgrade to Reactor 2023.0.4 and Micrometer 1.12.4 Includes AspectJ 1.9.21.1, Groovy 4.0.19, Tomcat 10.1.19, Jetty 12.0.7, Jackson 2.15.4, OpenPDF 1.3.42, Mockito 5.11, Checkstyle 10.14.1 Closes gh-32420 Closes gh-32431 --- .../build/CheckstyleConventions.java | 2 +- framework-platform/framework-platform.gradle | 32 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java b/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java index 6d04b5068aca..599c5b9180fe 100644 --- a/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java +++ b/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java @@ -50,7 +50,7 @@ public void apply(Project project) { project.getPlugins().apply(CheckstylePlugin.class); project.getTasks().withType(Checkstyle.class).forEach(checkstyle -> checkstyle.getMaxHeapSize().set("1g")); CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class); - checkstyle.setToolVersion("10.13.0"); + checkstyle.setToolVersion("10.14.1"); checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle")); String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion(); DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies(); diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index 133f02339dac..7d0fcf62949e 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -7,27 +7,27 @@ javaPlatform { } dependencies { - api(platform("com.fasterxml.jackson:jackson-bom:2.15.3")) - api(platform("io.micrometer:micrometer-bom:1.12.3")) + api(platform("com.fasterxml.jackson:jackson-bom:2.15.4")) + api(platform("io.micrometer:micrometer-bom:1.12.4")) api(platform("io.netty:netty-bom:4.1.107.Final")) api(platform("io.netty:netty5-bom:5.0.0.Alpha5")) - api(platform("io.projectreactor:reactor-bom:2023.0.3")) + api(platform("io.projectreactor:reactor-bom:2023.0.4")) api(platform("io.rsocket:rsocket-bom:1.1.3")) - api(platform("org.apache.groovy:groovy-bom:4.0.18")) + api(platform("org.apache.groovy:groovy-bom:4.0.19")) api(platform("org.apache.logging.log4j:log4j-bom:2.21.1")) api(platform("org.assertj:assertj-bom:3.25.3")) - api(platform("org.eclipse.jetty:jetty-bom:12.0.6")) - api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.6")) + api(platform("org.eclipse.jetty:jetty-bom:12.0.7")) + api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.7")) api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3")) api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.0")) api(platform("org.junit:junit-bom:5.10.2")) - api(platform("org.mockito:mockito-bom:5.10.0")) + api(platform("org.mockito:mockito-bom:5.11.0")) constraints { api("com.fasterxml:aalto-xml:1.3.2") api("com.fasterxml.woodstox:woodstox-core:6.5.1") api("com.github.ben-manes.caffeine:caffeine:3.1.8") - api("com.github.librepdf:openpdf:1.3.41") + api("com.github.librepdf:openpdf:1.3.42") api("com.google.code.findbugs:findbugs:3.0.1") api("com.google.code.findbugs:jsr305:3.0.2") api("com.google.code.gson:gson:2.10.1") @@ -103,19 +103,19 @@ dependencies { api("org.apache.httpcomponents.client5:httpclient5:5.3.1") api("org.apache.httpcomponents.core5:httpcore5-reactive:5.2.4") api("org.apache.poi:poi-ooxml:5.2.5") - api("org.apache.tomcat.embed:tomcat-embed-core:10.1.18") - api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.18") - api("org.apache.tomcat:tomcat-util:10.1.18") - api("org.apache.tomcat:tomcat-websocket:10.1.18") - api("org.aspectj:aspectjrt:1.9.21") - api("org.aspectj:aspectjtools:1.9.21") - api("org.aspectj:aspectjweaver:1.9.21") + api("org.apache.tomcat.embed:tomcat-embed-core:10.1.19") + api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.19") + api("org.apache.tomcat:tomcat-util:10.1.19") + api("org.apache.tomcat:tomcat-websocket:10.1.19") + api("org.aspectj:aspectjrt:1.9.21.1") + api("org.aspectj:aspectjtools:1.9.21.1") + api("org.aspectj:aspectjweaver:1.9.21.1") api("org.awaitility:awaitility:4.2.0") api("org.bouncycastle:bcpkix-jdk18on:1.72") api("org.codehaus.jettison:jettison:1.5.4") api("org.crac:crac:1.4.0") api("org.dom4j:dom4j:2.1.4") - api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.2") + api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.3") api("org.eclipse.persistence:org.eclipse.persistence.jpa:3.0.4") api("org.eclipse:yasson:2.0.4") api("org.ehcache:ehcache:3.10.8")