Skip to content

Commit 3d8d7ff

Browse files
committed
Upgrade to AspectJ 1.9.25, Tomcat 11.0.15, Netty 4.2.9, Jackson 3.0.3, EclipseLink 5.0.0-B13, Mockito 5.21, Checkstyle 12.3
1 parent 6d5a512 commit 3d8d7ff

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
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.2.0");
53+
checkstyle.setToolVersion("12.3.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: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ javaPlatform {
99
dependencies {
1010
api(platform("com.fasterxml.jackson:jackson-bom:2.20.1"))
1111
api(platform("io.micrometer:micrometer-bom:1.16.1"))
12-
api(platform("io.netty:netty-bom:4.2.7.Final"))
12+
api(platform("io.netty:netty-bom:4.2.9.Final"))
1313
api(platform("io.projectreactor:reactor-bom:2025.0.1"))
1414
api(platform("io.rsocket:rsocket-bom:1.1.5"))
1515
api(platform("org.apache.groovy:groovy-bom:5.0.3"))
@@ -20,8 +20,8 @@ dependencies {
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:6.0.1"))
23-
api(platform("org.mockito:mockito-bom:5.20.0"))
24-
api(platform("tools.jackson:jackson-bom:3.0.2"))
23+
api(platform("org.mockito:mockito-bom:5.21.0"))
24+
api(platform("tools.jackson:jackson-bom:3.0.3"))
2525

2626
constraints {
2727
api("com.fasterxml:aalto-xml:1.3.4")
@@ -97,13 +97,13 @@ 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.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")
104-
api("org.aspectj:aspectjrt:1.9.24")
105-
api("org.aspectj:aspectjtools:1.9.24")
106-
api("org.aspectj:aspectjweaver:1.9.24")
100+
api("org.apache.tomcat.embed:tomcat-embed-core:11.0.15")
101+
api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.15")
102+
api("org.apache.tomcat:tomcat-util:11.0.15")
103+
api("org.apache.tomcat:tomcat-websocket:11.0.15")
104+
api("org.aspectj:aspectjrt:1.9.25")
105+
api("org.aspectj:aspectjtools:1.9.25")
106+
api("org.aspectj:aspectjweaver:1.9.25")
107107
api("org.awaitility:awaitility:4.3.0")
108108
api("org.bouncycastle:bcpkix-jdk18on:1.72")
109109
api("org.codehaus.jettison:jettison:1.5.4")
@@ -112,7 +112,7 @@ dependencies {
112112
api("org.easymock:easymock:5.6.0")
113113
api("org.eclipse.angus:angus-mail:2.0.3")
114114
api("org.eclipse.jetty:jetty-reactive-httpclient:4.1.4")
115-
api("org.eclipse.persistence:org.eclipse.persistence.jpa:5.0.0-B11")
115+
api("org.eclipse.persistence:org.eclipse.persistence.jpa:5.0.0-B13")
116116
api("org.eclipse:yasson:3.0.4")
117117
api("org.ehcache:ehcache:3.10.8")
118118
api("org.ehcache:jcache:1.0.1")

0 commit comments

Comments
 (0)