Browse Source

Upgrade to Groovy 5.0.2, Tomcat 11.0.13, Jetty 12.1.3, Checkstyle 12.1.1

pull/35738/head
Juergen Hoeller 2 months ago
parent
commit
e6037a739e
  1. 2
      buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java
  2. 12
      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.0.0"); checkstyle.setToolVersion("12.1.1");
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();

12
framework-platform/framework-platform.gradle

@ -12,11 +12,11 @@ dependencies {
api(platform("io.netty:netty-bom:4.2.7.Final")) api(platform("io.netty:netty-bom:4.2.7.Final"))
api(platform("io.projectreactor:reactor-bom:2025.0.0-RC1")) api(platform("io.projectreactor:reactor-bom:2025.0.0-RC1"))
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.1")) api(platform("org.apache.groovy:groovy-bom:5.0.2"))
api(platform("org.apache.logging.log4j:log4j-bom:2.25.1")) api(platform("org.apache.logging.log4j:log4j-bom:2.25.1"))
api(platform("org.assertj:assertj-bom:3.27.6")) api(platform("org.assertj:assertj-bom:3.27.6"))
api(platform("org.eclipse.jetty:jetty-bom:12.1.3")) api(platform("org.eclipse.jetty:jetty-bom:12.1.3"))
api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.2")) api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.3"))
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.0")) api(platform("org.junit:junit-bom:6.0.0"))
@ -97,10 +97,10 @@ 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.12") api("org.apache.tomcat.embed:tomcat-embed-core:11.0.13")
api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.12") api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.13")
api("org.apache.tomcat:tomcat-util:11.0.12") api("org.apache.tomcat:tomcat-util:11.0.13")
api("org.apache.tomcat:tomcat-websocket:11.0.12") api("org.apache.tomcat:tomcat-websocket:11.0.13")
api("org.aspectj:aspectjrt:1.9.24") api("org.aspectj:aspectjrt:1.9.24")
api("org.aspectj:aspectjtools:1.9.24") api("org.aspectj:aspectjtools:1.9.24")
api("org.aspectj:aspectjweaver:1.9.24") api("org.aspectj:aspectjweaver:1.9.24")

Loading…
Cancel
Save