Skip to content

Commit 9f9b33c

Browse files
committed
Upgrade to Reactor 2025.0.0-M6, Micrometer 1.16.0-M2, Jetty 12.1.0.beta3
Includes Checkstyle 11.0, Groovy 5.0 RC1, JRuby 10.0.2, MockK 1.14.5 Closes gh-35310 Closes gh-35311 Closes gh-35233
1 parent 39de72a commit 9f9b33c

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
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.26.1");
53+
checkstyle.setToolVersion("11.0.0");
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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ javaPlatform {
88

99
dependencies {
1010
api(platform("com.fasterxml.jackson:jackson-bom:2.19.2"))
11-
api(platform("io.micrometer:micrometer-bom:1.16.0-M1"))
11+
api(platform("io.micrometer:micrometer-bom:1.16.0-M2"))
1212
api(platform("io.netty:netty-bom:4.2.3.Final"))
13-
api(platform("io.projectreactor:reactor-bom:2025.0.0-M5"))
13+
api(platform("io.projectreactor:reactor-bom:2025.0.0-M6"))
1414
api(platform("io.rsocket:rsocket-bom:1.1.5"))
15-
api(platform("org.apache.groovy:groovy-bom:4.0.28"))
15+
api(platform("org.apache.groovy:groovy-bom:5.0.0-rc-1"))
1616
api(platform("org.apache.logging.log4j:log4j-bom:3.0.0-beta3"))
1717
api(platform("org.assertj:assertj-bom:3.27.3"))
18-
api(platform("org.eclipse.jetty:jetty-bom:12.1.0.beta2"))
19-
api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.0.beta1"))
18+
api(platform("org.eclipse.jetty:jetty-bom:12.1.0.beta3"))
19+
api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.0.beta3"))
2020
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2"))
2121
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.9.0"))
2222
api(platform("org.junit:junit-bom:5.13.4"))
@@ -47,7 +47,7 @@ dependencies {
4747
api("commons-io:commons-io:2.15.0")
4848
api("commons-logging:commons-logging:1.3.5")
4949
api("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.2")
50-
api("io.mockk:mockk:1.14.4")
50+
api("io.mockk:mockk:1.14.5")
5151
api("io.projectreactor.tools:blockhound:1.0.8.RELEASE")
5252
api("io.r2dbc:r2dbc-h2:1.0.0.RELEASE")
5353
api("io.r2dbc:r2dbc-spi-test:1.0.0.RELEASE")
@@ -130,7 +130,7 @@ dependencies {
130130
api("org.htmlunit:htmlunit:4.14.0")
131131
api("org.javamoney:moneta:1.4.4")
132132
api("org.jboss.logging:jboss-logging:3.6.1.Final")
133-
api("org.jruby:jruby:9.4.13.0")
133+
api("org.jruby:jruby:10.0.2.0")
134134
api("org.jspecify:jspecify:1.0.0")
135135
api("org.junit.support:testng-engine:1.0.5")
136136
api("org.mozilla:rhino:1.7.15")

0 commit comments

Comments
 (0)