diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index 5a71749e5a3..356f1746a65 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -125,8 +125,8 @@ dependencies { api("org.glassfish:jakarta.el:4.0.2") api("org.graalvm.sdk:graal-sdk:22.3.1") api("org.hamcrest:hamcrest:2.2") - api("org.hibernate:hibernate-core:7.0.0.Beta2") - api("org.hibernate:hibernate-validator:9.0.0.Beta3") + api("org.hibernate.orm:hibernate-core:7.0.0.Beta3") + api("org.hibernate.validator:hibernate-validator:9.0.0.CR1") api("org.hsqldb:hsqldb:2.7.4") api("org.htmlunit:htmlunit:4.6.0") api("org.javamoney:moneta:1.4.4") diff --git a/integration-tests/integration-tests.gradle b/integration-tests/integration-tests.gradle index b386be32ddb..b8b3fc13e34 100644 --- a/integration-tests/integration-tests.gradle +++ b/integration-tests/integration-tests.gradle @@ -26,7 +26,7 @@ dependencies { testImplementation("jakarta.servlet:jakarta.servlet-api") testImplementation("org.aspectj:aspectjweaver") testImplementation("org.hsqldb:hsqldb") - testImplementation("org.hibernate:hibernate-core") + testImplementation("org.hibernate.orm:hibernate-core") testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor") } diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle index 31da2964c76..a8ea76804ce 100644 --- a/spring-context/spring-context.gradle +++ b/spring-context/spring-context.gradle @@ -26,7 +26,7 @@ dependencies { optional("org.apache-extras.beanshell:bsh") optional("org.aspectj:aspectjweaver") optional("org.crac:crac") - optional("org.hibernate:hibernate-validator") + optional("org.hibernate.validator:hibernate-validator") optional("org.jetbrains.kotlin:kotlin-reflect") optional("org.jetbrains.kotlin:kotlin-stdlib") optional("org.jetbrains.kotlinx:kotlinx-coroutines-core") diff --git a/spring-orm/spring-orm.gradle b/spring-orm/spring-orm.gradle index 9f39583ece1..e9cd86a53dd 100644 --- a/spring-orm/spring-orm.gradle +++ b/spring-orm/spring-orm.gradle @@ -11,7 +11,7 @@ dependencies { optional(project(":spring-web")) optional("jakarta.servlet:jakarta.servlet-api") optional("org.eclipse.persistence:org.eclipse.persistence.jpa") - optional("org.hibernate:hibernate-core") + optional("org.hibernate.orm:hibernate-core") testImplementation(project(":spring-core-test")) testImplementation(testFixtures(project(":spring-beans"))) testImplementation(testFixtures(project(":spring-context"))) diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java index 074f1028535..ad92e4b9608 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/LocalSessionFactoryBuilder.java @@ -285,18 +285,6 @@ public class LocalSessionFactoryBuilder extends Configuration { return this; } - /** - * Add the given annotated classes in a batch. - * @see #addAnnotatedClass - * @see #scanPackages - */ - public LocalSessionFactoryBuilder addAnnotatedClasses(Class... annotatedClasses) { - for (Class annotatedClass : annotatedClasses) { - addAnnotatedClass(annotatedClass); - } - return this; - } - /** * Add the given annotated packages in a batch. * @see #addPackage diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle index b84e77f76fb..f703232a89d 100644 --- a/spring-test/spring-test.gradle +++ b/spring-test/spring-test.gradle @@ -77,8 +77,8 @@ dependencies { } testImplementation("org.awaitility:awaitility") testImplementation("org.easymock:easymock") - testImplementation("org.hibernate:hibernate-core") - testImplementation("org.hibernate:hibernate-validator") + testImplementation("org.hibernate.orm:hibernate-core") + testImplementation("org.hibernate.validator:hibernate-validator") testImplementation("org.hsqldb:hsqldb") testImplementation("org.junit.platform:junit-platform-testkit") testRuntimeOnly("com.sun.xml.bind:jaxb-core") diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index b107f41a0bf..94bbee4d656 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -99,5 +99,5 @@ dependencies { testRuntimeOnly("org.eclipse.angus:angus-mail") testRuntimeOnly("org.eclipse:yasson") testRuntimeOnly("org.glassfish:jakarta.el") - testRuntimeOnly("org.hibernate:hibernate-validator") + testRuntimeOnly("org.hibernate.validator:hibernate-validator") } diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index 4bec8920dda..00982e63b93 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -52,7 +52,7 @@ dependencies { testImplementation("org.apache.tomcat.embed:tomcat-embed-core") testImplementation("org.eclipse.jetty:jetty-reactive-httpclient") testImplementation("org.eclipse.jetty:jetty-server") - testImplementation("org.hibernate:hibernate-validator") + testImplementation("org.hibernate.validator:hibernate-validator") testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-json") testRuntimeOnly("com.sun.xml.bind:jaxb-core") testRuntimeOnly("com.sun.xml.bind:jaxb-impl") diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle index 2bc08e35aae..32d3aa95e58 100644 --- a/spring-webmvc/spring-webmvc.gradle +++ b/spring-webmvc/spring-webmvc.gradle @@ -59,7 +59,7 @@ dependencies { testImplementation("org.eclipse.jetty.ee10:jetty-ee10-servlet") { exclude group: "jakarta.servlet", module: "jakarta.servlet-api" } - testImplementation("org.hibernate:hibernate-validator") + testImplementation("org.hibernate.validator:hibernate-validator") testImplementation("org.mozilla:rhino") testImplementation("org.skyscreamer:jsonassert") testImplementation("org.xmlunit:xmlunit-assertj")