Skip to content

Commit df376d9

Browse files
committed
Upgrade to Micrometer 1.12.12 and Reactor 2023.0.12
Includes Netty 4.1.114, Jetty 12.0.15, Jetty Reactive HttpClient 4.0.8, RxJava 3.1.9, RSocket 1.1.4, Groovy 4.0.24, JRuby 9.4.9, Checkstyle 10.20.1 Closes gh-33877 Closes gh-33879
1 parent 4d792d0 commit df376d9

File tree

2 files changed

+11
-11
lines changed

2 files changed

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

99
dependencies {
1010
api(platform("com.fasterxml.jackson:jackson-bom:2.15.4"))
11-
api(platform("io.micrometer:micrometer-bom:1.12.11"))
12-
api(platform("io.netty:netty-bom:4.1.113.Final"))
11+
api(platform("io.micrometer:micrometer-bom:1.12.12"))
12+
api(platform("io.netty:netty-bom:4.1.114.Final"))
1313
api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
14-
api(platform("io.projectreactor:reactor-bom:2023.0.11"))
15-
api(platform("io.rsocket:rsocket-bom:1.1.3"))
16-
api(platform("org.apache.groovy:groovy-bom:4.0.23"))
14+
api(platform("io.projectreactor:reactor-bom:2023.0.12"))
15+
api(platform("io.rsocket:rsocket-bom:1.1.4"))
16+
api(platform("org.apache.groovy:groovy-bom:4.0.24"))
1717
api(platform("org.apache.logging.log4j:log4j-bom:2.21.1"))
1818
api(platform("org.assertj:assertj-bom:3.26.3"))
19-
api(platform("org.eclipse.jetty:jetty-bom:12.0.13"))
20-
api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.13"))
19+
api(platform("org.eclipse.jetty:jetty-bom:12.0.15"))
20+
api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.15"))
2121
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3"))
2222
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3"))
2323
api(platform("org.junit:junit-bom:5.10.5"))
@@ -54,7 +54,7 @@ dependencies {
5454
api("io.r2dbc:r2dbc-h2:1.0.0.RELEASE")
5555
api("io.r2dbc:r2dbc-spi-test:1.0.0.RELEASE")
5656
api("io.r2dbc:r2dbc-spi:1.0.0.RELEASE")
57-
api("io.reactivex.rxjava3:rxjava:3.1.8")
57+
api("io.reactivex.rxjava3:rxjava:3.1.9")
5858
api("io.smallrye.reactive:mutiny:1.10.0")
5959
api("io.undertow:undertow-core:2.3.17.Final")
6060
api("io.undertow:undertow-servlet:2.3.17.Final")
@@ -116,7 +116,7 @@ dependencies {
116116
api("org.codehaus.jettison:jettison:1.5.4")
117117
api("org.crac:crac:1.4.0")
118118
api("org.dom4j:dom4j:2.1.4")
119-
api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.7")
119+
api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.8")
120120
api("org.eclipse.persistence:org.eclipse.persistence.jpa:3.0.4")
121121
api("org.eclipse:yasson:2.0.4")
122122
api("org.ehcache:ehcache:3.10.8")
@@ -131,7 +131,7 @@ dependencies {
131131
api("org.hibernate:hibernate-validator:7.0.5.Final")
132132
api("org.hsqldb:hsqldb:2.7.2")
133133
api("org.javamoney:moneta:1.4.4")
134-
api("org.jruby:jruby:9.4.8.0")
134+
api("org.jruby:jruby:9.4.9.0")
135135
api("org.junit.support:testng-engine:1.0.5")
136136
api("org.mozilla:rhino:1.7.15")
137137
api("org.ogce:xpp3:1.1.6")

0 commit comments

Comments
 (0)