diff --git a/build.gradle b/build.gradle index e8d3db926a..bb7250448b 100644 --- a/build.gradle +++ b/build.gradle @@ -62,7 +62,6 @@ configure([rootProject] + javaProjects) { project -> matching { it.name.endsWith("Classpath") }.all { it.extendsFrom(dependencyManagement) } } - dependencies { dependencyManagement(enforcedPlatform(dependencies.project(path: ":framework-platform"))) testImplementation("org.junit.jupiter:junit-jupiter-api") diff --git a/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java b/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java index 4ae56b9ff3..5d4bdd2395 100644 --- a/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java +++ b/buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java @@ -49,7 +49,7 @@ public class CheckstyleConventions { project.getPlugins().apply(CheckstylePlugin.class); project.getTasks().withType(Checkstyle.class).forEach(checkstyle -> checkstyle.getMaxHeapSize().set("1g")); CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class); - checkstyle.setToolVersion("10.9.3"); + checkstyle.setToolVersion("10.10.0"); checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle")); String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion(); DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies(); diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index df384a1d25..4d98e8de0a 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -7,7 +7,7 @@ javaPlatform { } dependencies { - api(platform("com.fasterxml.jackson:jackson-bom:2.14.2")) + api(platform("com.fasterxml.jackson:jackson-bom:2.14.3")) api(platform("io.micrometer:micrometer-bom:1.10.6")) api(platform("io.netty:netty-bom:4.1.92.Final")) api(platform("io.netty:netty5-bom:5.0.0.Alpha5")) diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index 0da919218d..a6289ac8d9 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -37,8 +37,10 @@ dependencies { optional("org.eclipse.jetty:jetty-servlet") { exclude group: "jakarta.servlet", module: "jakarta.servlet-api" } - optional("org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.0.beta0") { + optional("org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.0.beta1") { exclude group: "jakarta.servlet", module: "jakarta.servlet-api" + exclude group: "org.eclipse.jetty", module: "jetty-ee" + exclude group: "org.eclipse.jetty", module: "jetty-security" exclude group: "org.eclipse.jetty", module: "jetty-server" exclude group: "org.eclipse.jetty", module: "jetty-servlet" }