Skip to content

Commit 86ea700

Browse files
committed
Upgrade to Groovy 4.0.26, Jetty 12.0.18, Apache HttpClient 5.4.3, Checkstyle 10.22
1 parent 0a157fa commit 86ea700

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

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

+2-2
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("10.21.2");
53+
checkstyle.setToolVersion("10.22.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();
@@ -64,7 +64,7 @@ private static void configureNoHttpPlugin(Project project) {
6464
NoHttpExtension noHttp = project.getExtensions().getByType(NoHttpExtension.class);
6565
noHttp.setAllowlistFile(project.file("src/nohttp/allowlist.lines"));
6666
noHttp.getSource().exclude("**/test-output/**", "**/.settings/**",
67-
"**/.classpath", "**/.project", "**/.gradle/**", "**/node_modules/**");
67+
"**/.classpath", "**/.project", "**/.gradle/**", "**/node_modules/**", "buildSrc/build/**");
6868
List<String> buildFolders = List.of("bin", "build", "out");
6969
project.allprojects(subproject -> {
7070
Path rootPath = project.getRootDir().toPath();

framework-platform/framework-platform.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ dependencies {
1313
api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
1414
api(platform("io.projectreactor:reactor-bom:2023.0.16"))
1515
api(platform("io.rsocket:rsocket-bom:1.1.5"))
16-
api(platform("org.apache.groovy:groovy-bom:4.0.24"))
16+
api(platform("org.apache.groovy:groovy-bom:4.0.26"))
1717
api(platform("org.apache.logging.log4j:log4j-bom:2.21.1"))
1818
api(platform("org.assertj:assertj-bom:3.27.3"))
19-
api(platform("org.eclipse.jetty:jetty-bom:12.0.17"))
20-
api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.17"))
19+
api(platform("org.eclipse.jetty:jetty-bom:12.0.18"))
20+
api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.18"))
2121
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3"))
2222
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3"))
2323
api(platform("org.junit:junit-bom:5.10.5"))
@@ -101,8 +101,8 @@ dependencies {
101101
api("org.apache.derby:derby:10.16.1.1")
102102
api("org.apache.derby:derbyclient:10.16.1.1")
103103
api("org.apache.derby:derbytools:10.16.1.1")
104-
api("org.apache.httpcomponents.client5:httpclient5:5.4.2")
105-
api("org.apache.httpcomponents.core5:httpcore5-reactive:5.3.3")
104+
api("org.apache.httpcomponents.client5:httpclient5:5.4.3")
105+
api("org.apache.httpcomponents.core5:httpcore5-reactive:5.3.4")
106106
api("org.apache.poi:poi-ooxml:5.2.5")
107107
api("org.apache.tomcat.embed:tomcat-embed-core:10.1.28")
108108
api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.28")

0 commit comments

Comments
 (0)