spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 08:24:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '7.0.x'

Browse Source 
# Conflicts:
#	framework-platform/framework-platform.gradle
This commit is contained in:
Juergen Hoeller
2026-07-29 12:17:09 +02:00
parent 16d9965fe3 28a78170b5
commit 91c6851f29
3 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework-platform/framework-platform.gradle
+8 -8
View File
@@ -15,8 +15,8 @@ dependencies {
api(platform("org.apache.groovy:groovy-bom:5.0.7"))
api(platform("org.apache.logging.log4j:log4j-bom:2.26.1"))
api(platform("org.assertj:assertj-bom:3.27.7"))
api(platform("org.eclipse.jetty:jetty-bom:12.1.10"))
api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.10"))
api(platform("org.eclipse.jetty:jetty-bom:12.1.11"))
api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.11"))
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.11.0"))
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.11.0"))
api(platform("org.junit:junit-bom:6.1.2"))
@@ -96,10 +96,10 @@ dependencies {
api("org.apache.httpcomponents.client5:httpclient5:5.6")
api("org.apache.httpcomponents.core5:httpcore5-reactive:5.4.2")
api("org.apache.poi:poi-ooxml:5.5.1")
api("org.apache.tomcat.embed:tomcat-embed-core:11.0.23")
api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.23")
api("org.apache.tomcat:tomcat-util:11.0.23")
api("org.apache.tomcat:tomcat-websocket:11.0.23")
api("org.apache.tomcat.embed:tomcat-embed-core:11.0.24")
api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.24")
api("org.apache.tomcat:tomcat-util:11.0.24")
api("org.apache.tomcat:tomcat-websocket:11.0.24")
api("org.aspectj:aspectjrt:1.9.25")
api("org.aspectj:aspectjtools:1.9.25")
api("org.aspectj:aspectjweaver:1.9.25")
@@ -120,8 +120,8 @@ dependencies {
api("org.glassfish:jakarta.el:4.0.2")
api("org.graalvm.sdk:graal-sdk:22.3.1")
api("org.hamcrest:hamcrest:3.0")
api("org.hibernate.orm:hibernate-core:7.4.4.Final")
api("org.hibernate.validator:hibernate-validator:9.1.2.Final")
api("org.hibernate.orm:hibernate-core:7.4.5.Final")
api("org.hibernate.validator:hibernate-validator:9.1.3.Final")
api("org.hsqldb:hsqldb:2.7.4")
api("org.htmlunit:htmlunit:4.21.0")
api("org.javamoney:moneta:1.4.4")