Skip to content

Commit 888d0f9

Browse files
committed
Upgrade to Micrometer 1.16.0
Includes Tomcat 11.0.14, Jackson 3.0.2/2.20.1, Hibernate 7.2.0.CR2, Checkstyle 12.1.2 Closes gh-35811
1 parent 08798e0 commit 888d0f9

File tree

2 files changed

+9
-9
lines changed

2 files changed

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

99
dependencies {
10-
api(platform("com.fasterxml.jackson:jackson-bom:2.20.0"))
11-
api(platform("io.micrometer:micrometer-bom:1.16.0-RC1"))
10+
api(platform("com.fasterxml.jackson:jackson-bom:2.20.1"))
11+
api(platform("io.micrometer:micrometer-bom:1.16.0"))
1212
api(platform("io.netty:netty-bom:4.2.7.Final"))
1313
api(platform("io.projectreactor:reactor-bom:2025.0.0"))
1414
api(platform("io.rsocket:rsocket-bom:1.1.5"))
@@ -21,7 +21,7 @@ dependencies {
2121
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.9.0"))
2222
api(platform("org.junit:junit-bom:6.0.1"))
2323
api(platform("org.mockito:mockito-bom:5.20.0"))
24-
api(platform("tools.jackson:jackson-bom:3.0.1"))
24+
api(platform("tools.jackson:jackson-bom:3.0.2"))
2525

2626
constraints {
2727
api("com.fasterxml:aalto-xml:1.3.4")
@@ -97,10 +97,10 @@ dependencies {
9797
api("org.apache.httpcomponents.client5:httpclient5:5.5")
9898
api("org.apache.httpcomponents.core5:httpcore5-reactive:5.3.5")
9999
api("org.apache.poi:poi-ooxml:5.2.5")
100-
api("org.apache.tomcat.embed:tomcat-embed-core:11.0.13")
101-
api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.13")
102-
api("org.apache.tomcat:tomcat-util:11.0.13")
103-
api("org.apache.tomcat:tomcat-websocket:11.0.13")
100+
api("org.apache.tomcat.embed:tomcat-embed-core:11.0.14")
101+
api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.14")
102+
api("org.apache.tomcat:tomcat-util:11.0.14")
103+
api("org.apache.tomcat:tomcat-websocket:11.0.14")
104104
api("org.aspectj:aspectjrt:1.9.24")
105105
api("org.aspectj:aspectjtools:1.9.24")
106106
api("org.aspectj:aspectjweaver:1.9.24")
@@ -121,7 +121,7 @@ dependencies {
121121
api("org.glassfish:jakarta.el:4.0.2")
122122
api("org.graalvm.sdk:graal-sdk:22.3.1")
123123
api("org.hamcrest:hamcrest:3.0")
124-
api("org.hibernate.orm:hibernate-core:7.2.0.CR1")
124+
api("org.hibernate.orm:hibernate-core:7.2.0.CR2")
125125
api("org.hibernate.validator:hibernate-validator:9.1.0.Final")
126126
api("org.hsqldb:hsqldb:2.7.4")
127127
api("org.htmlunit:htmlunit:4.18.0")

0 commit comments

Comments
 (0)