Browse Source

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

pull/36032/head
Juergen Hoeller 1 day ago
parent
commit
3d8d7ffa1e
  1. 2
      buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java
  2. 22
      framework-platform/framework-platform.gradle

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

@ -50,7 +50,7 @@ public class CheckstyleConventions {
project.getPlugins().apply(CheckstylePlugin.class); project.getPlugins().apply(CheckstylePlugin.class);
project.getTasks().withType(Checkstyle.class).forEach(checkstyle -> checkstyle.getMaxHeapSize().set("1g")); project.getTasks().withType(Checkstyle.class).forEach(checkstyle -> checkstyle.getMaxHeapSize().set("1g"));
CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class); CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class);
checkstyle.setToolVersion("12.2.0"); checkstyle.setToolVersion("12.3.0");
checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle")); checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle"));
String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion(); String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion();
DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies(); DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();

22
framework-platform/framework-platform.gradle

@ -9,7 +9,7 @@ javaPlatform {
dependencies { dependencies {
api(platform("com.fasterxml.jackson:jackson-bom:2.20.1")) api(platform("com.fasterxml.jackson:jackson-bom:2.20.1"))
api(platform("io.micrometer:micrometer-bom:1.16.1")) api(platform("io.micrometer:micrometer-bom:1.16.1"))
api(platform("io.netty:netty-bom:4.2.7.Final")) api(platform("io.netty:netty-bom:4.2.9.Final"))
api(platform("io.projectreactor:reactor-bom:2025.0.1")) api(platform("io.projectreactor:reactor-bom:2025.0.1"))
api(platform("io.rsocket:rsocket-bom:1.1.5")) api(platform("io.rsocket:rsocket-bom:1.1.5"))
api(platform("org.apache.groovy:groovy-bom:5.0.3")) api(platform("org.apache.groovy:groovy-bom:5.0.3"))
@ -20,8 +20,8 @@ dependencies {
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2")) api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2"))
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.9.0")) api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.9.0"))
api(platform("org.junit:junit-bom:6.0.1")) api(platform("org.junit:junit-bom:6.0.1"))
api(platform("org.mockito:mockito-bom:5.20.0")) api(platform("org.mockito:mockito-bom:5.21.0"))
api(platform("tools.jackson:jackson-bom:3.0.2")) api(platform("tools.jackson:jackson-bom:3.0.3"))
constraints { constraints {
api("com.fasterxml:aalto-xml:1.3.4") api("com.fasterxml:aalto-xml:1.3.4")
@ -97,13 +97,13 @@ dependencies {
api("org.apache.httpcomponents.client5:httpclient5:5.5") api("org.apache.httpcomponents.client5:httpclient5:5.5")
api("org.apache.httpcomponents.core5:httpcore5-reactive:5.3.5") api("org.apache.httpcomponents.core5:httpcore5-reactive:5.3.5")
api("org.apache.poi:poi-ooxml:5.2.5") api("org.apache.poi:poi-ooxml:5.2.5")
api("org.apache.tomcat.embed:tomcat-embed-core:11.0.14") api("org.apache.tomcat.embed:tomcat-embed-core:11.0.15")
api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.14") api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.15")
api("org.apache.tomcat:tomcat-util:11.0.14") api("org.apache.tomcat:tomcat-util:11.0.15")
api("org.apache.tomcat:tomcat-websocket:11.0.14") api("org.apache.tomcat:tomcat-websocket:11.0.15")
api("org.aspectj:aspectjrt:1.9.24") api("org.aspectj:aspectjrt:1.9.25")
api("org.aspectj:aspectjtools:1.9.24") api("org.aspectj:aspectjtools:1.9.25")
api("org.aspectj:aspectjweaver:1.9.24") api("org.aspectj:aspectjweaver:1.9.25")
api("org.awaitility:awaitility:4.3.0") api("org.awaitility:awaitility:4.3.0")
api("org.bouncycastle:bcpkix-jdk18on:1.72") api("org.bouncycastle:bcpkix-jdk18on:1.72")
api("org.codehaus.jettison:jettison:1.5.4") api("org.codehaus.jettison:jettison:1.5.4")
@ -112,7 +112,7 @@ dependencies {
api("org.easymock:easymock:5.6.0") api("org.easymock:easymock:5.6.0")
api("org.eclipse.angus:angus-mail:2.0.3") api("org.eclipse.angus:angus-mail:2.0.3")
api("org.eclipse.jetty:jetty-reactive-httpclient:4.1.4") api("org.eclipse.jetty:jetty-reactive-httpclient:4.1.4")
api("org.eclipse.persistence:org.eclipse.persistence.jpa:5.0.0-B11") api("org.eclipse.persistence:org.eclipse.persistence.jpa:5.0.0-B13")
api("org.eclipse:yasson:3.0.4") api("org.eclipse:yasson:3.0.4")
api("org.ehcache:ehcache:3.10.8") api("org.ehcache:ehcache:3.10.8")
api("org.ehcache:jcache:1.0.1") api("org.ehcache:jcache:1.0.1")

Loading…
Cancel
Save