Skip to content

Commit 4ca596b

Browse files
committed
Upgrade to Micrometer 1.14.0 and Reactor 2024.0.0
Includes Netty 4.1.114, Jetty 12.0.15, Jetty Reactive HttpClient 4.0.8, RxJava 3.1.9, RSocket 1.1.4, HSQLDB 2.7.4, H2 2.3.232, SnakeYAML 2.3, Groovy 4.0.24, JRuby 9.4.9, Jackson 2.18.1, Gson 2.11, Protobuf 4.28.3, XStream 1.4.21, Woodstox 6.7, TestNG 7.10.2, Selenium 4.26, HtmlUnit 4.6, XMLUnit 2.10, Checkstyle 10.20.1 Closes gh-33876 Closes gh-33878
1 parent 90ef7ac commit 4ca596b

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

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

+1-1
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

+24-24
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,32 @@ javaPlatform {
77
}
88

99
dependencies {
10-
api(platform("com.fasterxml.jackson:jackson-bom:2.18.0"))
11-
api(platform("io.micrometer:micrometer-bom:1.14.0-RC1"))
12-
api(platform("io.netty:netty-bom:4.1.113.Final"))
10+
api(platform("com.fasterxml.jackson:jackson-bom:2.18.1"))
11+
api(platform("io.micrometer:micrometer-bom:1.14.0"))
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:2024.0.0-RC1"))
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:2024.0.0"))
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.8.1"))
2222
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3"))
2323
api(platform("org.junit:junit-bom:5.11.3"))
2424
api(platform("org.mockito:mockito-bom:5.14.2"))
2525

2626
constraints {
2727
api("com.fasterxml:aalto-xml:1.3.2")
28-
api("com.fasterxml.woodstox:woodstox-core:6.6.2")
28+
api("com.fasterxml.woodstox:woodstox-core:6.7.0")
2929
api("com.github.ben-manes.caffeine:caffeine:3.1.8")
3030
api("com.github.librepdf:openpdf:1.3.43")
3131
api("com.google.code.findbugs:findbugs:3.0.1")
3232
api("com.google.code.findbugs:jsr305:3.0.2")
33-
api("com.google.code.gson:gson:2.10.1")
34-
api("com.google.protobuf:protobuf-java-util:4.27.1")
35-
api("com.h2database:h2:2.2.224")
33+
api("com.google.code.gson:gson:2.11.0")
34+
api("com.google.protobuf:protobuf-java-util:4.28.3")
35+
api("com.h2database:h2:2.3.232")
3636
api("com.jayway.jsonpath:json-path:2.9.0")
3737
api("com.oracle.database.jdbc:ojdbc11:21.9.0.0")
3838
api("com.rometools:rome:1.19.0")
@@ -44,7 +44,7 @@ dependencies {
4444
api("com.sun.xml.bind:jaxb-impl:3.0.2")
4545
api("com.sun.xml.bind:jaxb-xjc:3.0.2")
4646
api("com.thoughtworks.qdox:qdox:2.1.0")
47-
api("com.thoughtworks.xstream:xstream:1.4.20")
47+
api("com.thoughtworks.xstream:xstream:1.4.21")
4848
api("commons-io:commons-io:2.15.0")
4949
api("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.2")
5050
api("io.micrometer:context-propagation:1.1.1")
@@ -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.crac:crac:1.4.0")
117117
api("org.dom4j:dom4j:2.1.4")
118118
api("org.easymock:easymock:5.4.0")
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")
@@ -129,25 +129,25 @@ dependencies {
129129
api("org.hamcrest:hamcrest:2.2")
130130
api("org.hibernate:hibernate-core-jakarta:5.6.15.Final")
131131
api("org.hibernate:hibernate-validator:7.0.5.Final")
132-
api("org.hsqldb:hsqldb:2.7.2")
133-
api("org.htmlunit:htmlunit:4.2.0")
132+
api("org.hsqldb:hsqldb:2.7.4")
133+
api("org.htmlunit:htmlunit:4.6.0")
134134
api("org.javamoney:moneta:1.4.4")
135-
api("org.jruby:jruby:9.4.8.0")
135+
api("org.jruby:jruby:9.4.9.0")
136136
api("org.junit.support:testng-engine:1.0.5")
137137
api("org.mozilla:rhino:1.7.15")
138138
api("org.ogce:xpp3:1.1.6")
139139
api("org.python:jython-standalone:2.7.3")
140140
api("org.quartz-scheduler:quartz:2.3.2")
141-
api("org.seleniumhq.selenium:htmlunit3-driver:4.20.0")
142-
api("org.seleniumhq.selenium:selenium-java:4.20.0")
141+
api("org.seleniumhq.selenium:htmlunit3-driver:4.26.0")
142+
api("org.seleniumhq.selenium:selenium-java:4.26.0")
143143
api("org.skyscreamer:jsonassert:1.5.3")
144144
api("org.slf4j:slf4j-api:2.0.16")
145-
api("org.testng:testng:7.9.0")
145+
api("org.testng:testng:7.10.2")
146146
api("org.webjars:underscorejs:1.8.3")
147147
api("org.webjars:webjars-locator-core:0.55")
148148
api("org.webjars:webjars-locator-lite:1.0.0")
149-
api("org.xmlunit:xmlunit-assertj:2.9.1")
150-
api("org.xmlunit:xmlunit-matchers:2.9.1")
151-
api("org.yaml:snakeyaml:2.2")
149+
api("org.xmlunit:xmlunit-assertj:2.10.0")
150+
api("org.xmlunit:xmlunit-matchers:2.10.0")
151+
api("org.yaml:snakeyaml:2.3")
152152
}
153153
}

0 commit comments

Comments
 (0)