Skip to content

Commit 8f29c71

Browse files
committed
Upgrade to Tomcat 11.0.12, Jetty 12.1.2, Jetty Reactive HttpClient 4.1, Hibernate ORM 7.2.0.CR1, EclipseLink 5.0.0-B11, Checkstyle 12.0
1 parent fef5627 commit 8f29c71

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
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("11.0.1");
53+
checkstyle.setToolVersion("12.0.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: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ dependencies {
1515
api(platform("org.apache.groovy:groovy-bom:5.0.1"))
1616
api(platform("org.apache.logging.log4j:log4j-bom:2.25.1"))
1717
api(platform("org.assertj:assertj-bom:3.27.6"))
18-
api(platform("org.eclipse.jetty:jetty-bom:12.1.1"))
19-
api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.1"))
18+
api(platform("org.eclipse.jetty:jetty-bom:12.1.2"))
19+
api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.2"))
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.0"))
@@ -97,10 +97,10 @@ 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.11")
101-
api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.11")
102-
api("org.apache.tomcat:tomcat-util:11.0.11")
103-
api("org.apache.tomcat:tomcat-websocket:11.0.11")
100+
api("org.apache.tomcat.embed:tomcat-embed-core:11.0.12")
101+
api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.12")
102+
api("org.apache.tomcat:tomcat-util:11.0.12")
103+
api("org.apache.tomcat:tomcat-websocket:11.0.12")
104104
api("org.aspectj:aspectjrt:1.9.24")
105105
api("org.aspectj:aspectjtools:1.9.24")
106106
api("org.aspectj:aspectjweaver:1.9.24")
@@ -111,8 +111,8 @@ dependencies {
111111
api("org.dom4j:dom4j:2.2.0")
112112
api("org.easymock:easymock:5.6.0")
113113
api("org.eclipse.angus:angus-mail:2.0.3")
114-
api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.12")
115-
api("org.eclipse.persistence:org.eclipse.persistence.jpa:5.0.0-B10")
114+
api("org.eclipse.jetty:jetty-reactive-httpclient:4.1.0")
115+
api("org.eclipse.persistence:org.eclipse.persistence.jpa:5.0.0-B11")
116116
api("org.eclipse:yasson:3.0.4")
117117
api("org.ehcache:ehcache:3.10.8")
118118
api("org.ehcache:jcache:1.0.1")
@@ -121,7 +121,7 @@ dependencies {
121121
api("org.glassfish:jakarta.el:4.0.2")
122122
api("org.graalvm.sdk:graal-sdk:22.3.1")
123123
api("org.hamcrest:hamcrest:3.0")
124-
api("org.hibernate.orm:hibernate-core:7.1.2.Final")
124+
api("org.hibernate.orm:hibernate-core:7.2.0.CR1")
125125
api("org.hibernate.validator:hibernate-validator:9.0.1.Final")
126126
api("org.hsqldb:hsqldb:2.7.4")
127127
api("org.htmlunit:htmlunit:4.17.0")

0 commit comments

Comments
 (0)