Skip to content

Commit e5a69dc

Browse files
committed
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
1 parent c2248c9 commit e5a69dc

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void apply(Project project) {
5050
project.getPlugins().apply(CheckstylePlugin.class);
5151
project.getTasks().withType(Checkstyle.class).forEach(checkstyle -> checkstyle.getMaxHeapSize().set("1g"));
5252
CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class);
53-
checkstyle.setToolVersion("10.13.0");
53+
checkstyle.setToolVersion("10.14.1");
5454
checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle"));
5555
String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion();
5656
DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();

framework-platform/framework-platform.gradle

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@ javaPlatform {
77
}
88

99
dependencies {
10-
api(platform("com.fasterxml.jackson:jackson-bom:2.15.3"))
11-
api(platform("io.micrometer:micrometer-bom:1.12.3"))
10+
api(platform("com.fasterxml.jackson:jackson-bom:2.15.4"))
11+
api(platform("io.micrometer:micrometer-bom:1.12.4"))
1212
api(platform("io.netty:netty-bom:4.1.107.Final"))
1313
api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
14-
api(platform("io.projectreactor:reactor-bom:2023.0.3"))
14+
api(platform("io.projectreactor:reactor-bom:2023.0.4"))
1515
api(platform("io.rsocket:rsocket-bom:1.1.3"))
16-
api(platform("org.apache.groovy:groovy-bom:4.0.18"))
16+
api(platform("org.apache.groovy:groovy-bom:4.0.19"))
1717
api(platform("org.apache.logging.log4j:log4j-bom:2.21.1"))
1818
api(platform("org.assertj:assertj-bom:3.25.3"))
19-
api(platform("org.eclipse.jetty:jetty-bom:12.0.6"))
20-
api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.6"))
19+
api(platform("org.eclipse.jetty:jetty-bom:12.0.7"))
20+
api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.7"))
2121
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3"))
2222
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.0"))
2323
api(platform("org.junit:junit-bom:5.10.2"))
24-
api(platform("org.mockito:mockito-bom:5.10.0"))
24+
api(platform("org.mockito:mockito-bom:5.11.0"))
2525

2626
constraints {
2727
api("com.fasterxml:aalto-xml:1.3.2")
2828
api("com.fasterxml.woodstox:woodstox-core:6.5.1")
2929
api("com.github.ben-manes.caffeine:caffeine:3.1.8")
30-
api("com.github.librepdf:openpdf:1.3.41")
30+
api("com.github.librepdf:openpdf:1.3.42")
3131
api("com.google.code.findbugs:findbugs:3.0.1")
3232
api("com.google.code.findbugs:jsr305:3.0.2")
3333
api("com.google.code.gson:gson:2.10.1")
@@ -103,19 +103,19 @@ dependencies {
103103
api("org.apache.httpcomponents.client5:httpclient5:5.3.1")
104104
api("org.apache.httpcomponents.core5:httpcore5-reactive:5.2.4")
105105
api("org.apache.poi:poi-ooxml:5.2.5")
106-
api("org.apache.tomcat.embed:tomcat-embed-core:10.1.18")
107-
api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.18")
108-
api("org.apache.tomcat:tomcat-util:10.1.18")
109-
api("org.apache.tomcat:tomcat-websocket:10.1.18")
110-
api("org.aspectj:aspectjrt:1.9.21")
111-
api("org.aspectj:aspectjtools:1.9.21")
112-
api("org.aspectj:aspectjweaver:1.9.21")
106+
api("org.apache.tomcat.embed:tomcat-embed-core:10.1.19")
107+
api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.19")
108+
api("org.apache.tomcat:tomcat-util:10.1.19")
109+
api("org.apache.tomcat:tomcat-websocket:10.1.19")
110+
api("org.aspectj:aspectjrt:1.9.21.1")
111+
api("org.aspectj:aspectjtools:1.9.21.1")
112+
api("org.aspectj:aspectjweaver:1.9.21.1")
113113
api("org.awaitility:awaitility:4.2.0")
114114
api("org.bouncycastle:bcpkix-jdk18on:1.72")
115115
api("org.codehaus.jettison:jettison:1.5.4")
116116
api("org.crac:crac:1.4.0")
117117
api("org.dom4j:dom4j:2.1.4")
118-
api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.2")
118+
api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.3")
119119
api("org.eclipse.persistence:org.eclipse.persistence.jpa:3.0.4")
120120
api("org.eclipse:yasson:2.0.4")
121121
api("org.ehcache:ehcache:3.10.8")

0 commit comments

Comments
 (0)