spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-10-11 01:59:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '6.2.x'

Browse Source 
# Conflicts:
#	framework-platform/framework-platform.gradle
#	spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesBeanRegistrationAotProcessor.java
#	spring-orm/src/test/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesBeanRegistrationAotProcessorTests.java
This commit is contained in:
Juergen Hoeller
2025-11-05 12:54:30 +01:00
parent e5fccd1fbb 2060c340ce
commit 585b4e08e8
6 changed files with 76 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework-platform/framework-platform.gradle
+4 -4
View File
@@ -26,7 +26,7 @@ dependencies {
constraints {
api("com.fasterxml:aalto-xml:1.3.4")
api("com.fasterxml.woodstox:woodstox-core:6.7.0")
api("com.github.ben-manes.caffeine:caffeine:3.2.2")
api("com.github.ben-manes.caffeine:caffeine:3.2.3")
api("com.github.librepdf:openpdf:1.3.43")
api("com.google.code.findbugs:findbugs:3.0.1")
api("com.google.code.findbugs:jsr305:3.0.2")
@@ -124,7 +124,7 @@ dependencies {
api("org.hibernate.orm:hibernate-core:7.2.0.CR1")
api("org.hibernate.validator:hibernate-validator:9.1.0.CR1")
api("org.hsqldb:hsqldb:2.7.4")
api("org.htmlunit:htmlunit:4.17.0")
api("org.htmlunit:htmlunit:4.18.0")
api("org.javamoney:moneta:1.4.4")
api("org.jboss.logging:jboss-logging:3.6.1.Final")
api("org.jruby:jruby:10.0.2.0")
@@ -135,8 +135,8 @@ dependencies {
api("org.python:jython-standalone:2.7.4")
api("org.quartz-scheduler:quartz:2.3.2")
api("org.reactivestreams:reactive-streams:1.0.4")
api("org.seleniumhq.selenium:htmlunit3-driver:4.36.1")
api("org.seleniumhq.selenium:selenium-java:4.36.0")
api("org.seleniumhq.selenium:htmlunit3-driver:4.38.0")
api("org.seleniumhq.selenium:selenium-java:4.38.0")
api("org.skyscreamer:jsonassert:1.5.3")
api("org.testng:testng:7.11.0")
api("org.webjars:underscorejs:1.8.3")