Skip to content

Commit 4aa8619

Browse files
committed
Upgrade to Tomcat 10.1.8, Jetty 11.0.15 / 12.0.0.beta1, Netty 4.1.92, Jackson 2.14.3, Mockito 5.3.1, Checkstyle 10.10
1 parent 2c7e866 commit 4aa8619

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ configure([rootProject] + javaProjects) { project ->
7878
}
7979

8080
checkstyle {
81-
toolVersion = "10.9.3"
81+
toolVersion = "10.10.0"
8282
configDirectory.set(rootProject.file("src/checkstyle"))
8383
}
8484

framework-platform/framework-platform.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ javaPlatform {
77
}
88

99
dependencies {
10-
api(platform("com.fasterxml.jackson:jackson-bom:2.14.2"))
10+
api(platform("com.fasterxml.jackson:jackson-bom:2.14.3"))
1111
api(platform("io.micrometer:micrometer-bom:1.10.6"))
12-
api(platform("io.netty:netty-bom:4.1.91.Final"))
12+
api(platform("io.netty:netty-bom:4.1.92.Final"))
1313
api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
1414
api(platform("io.projectreactor:reactor-bom:2022.0.6"))
1515
api(platform("io.rsocket:rsocket-bom:1.1.3"))
1616
api(platform("org.apache.groovy:groovy-bom:4.0.11"))
1717
api(platform("org.apache.logging.log4j:log4j-bom:2.20.0"))
18-
api(platform("org.eclipse.jetty:jetty-bom:11.0.14"))
18+
api(platform("org.eclipse.jetty:jetty-bom:11.0.15"))
1919
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4"))
2020
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.4.0"))
2121
api(platform("org.junit:junit-bom:5.9.3"))
22-
api(platform("org.mockito:mockito-bom:5.3.0"))
22+
api(platform("org.mockito:mockito-bom:5.3.1"))
2323

2424
constraints {
2525
api("com.fasterxml:aalto-xml:1.3.2")
@@ -99,10 +99,10 @@ dependencies {
9999
api("org.apache.httpcomponents.client5:httpclient5:5.2.1")
100100
api("org.apache.httpcomponents.core5:httpcore5-reactive:5.2.1")
101101
api("org.apache.poi:poi-ooxml:5.2.3")
102-
api("org.apache.tomcat.embed:tomcat-embed-core:10.1.7")
103-
api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.7")
104-
api("org.apache.tomcat:tomcat-util:10.1.7")
105-
api("org.apache.tomcat:tomcat-websocket:10.1.7")
102+
api("org.apache.tomcat.embed:tomcat-embed-core:10.1.8")
103+
api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.8")
104+
api("org.apache.tomcat:tomcat-util:10.1.8")
105+
api("org.apache.tomcat:tomcat-websocket:10.1.8")
106106
api("org.aspectj:aspectjrt:1.9.19")
107107
api("org.aspectj:aspectjtools:1.9.19")
108108
api("org.aspectj:aspectjweaver:1.9.19")

spring-web/spring-web.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ dependencies {
3737
optional("org.eclipse.jetty:jetty-servlet") {
3838
exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
3939
}
40-
optional("org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.0.beta0") {
40+
optional("org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.0.beta1") {
4141
exclude group: "jakarta.servlet", module: "jakarta.servlet-api"
42+
exclude group: "org.eclipse.jetty", module: "jetty-ee"
43+
exclude group: "org.eclipse.jetty", module: "jetty-security"
4244
exclude group: "org.eclipse.jetty", module: "jetty-server"
4345
exclude group: "org.eclipse.jetty", module: "jetty-servlet"
4446
}

0 commit comments

Comments
 (0)