From beb3a91847e54a26e8e0dcf330596f0dce83f756 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <juergen.hoeller@broadcom.com>
Date: Tue, 11 Mar 2025 19:17:00 +0100
Subject: [PATCH] Upgrade to Hibernate ORM 7.0.0.Beta4

Includes Hamcrest 3.0

See gh-33750
---
 framework-platform/framework-platform.gradle              | 4 ++--
 .../orm/hibernate5/SpringBeanContainer.java               | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle
index 0aa93bd6f7e..e26d8195b73 100644
--- a/framework-platform/framework-platform.gradle
+++ b/framework-platform/framework-platform.gradle
@@ -123,8 +123,8 @@ dependencies {
 		api("org.glassfish.external:opendmk_jmxremote_optional_jar:1.0-b01-ea")
 		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.orm:hibernate-core:7.0.0.Beta3")
+		api("org.hamcrest:hamcrest:3.0")
+		api("org.hibernate.orm:hibernate-core:7.0.0.Beta4")
 		api("org.hibernate.validator:hibernate-validator:9.0.0.CR1")
 		api("org.hsqldb:hsqldb:2.7.4")
 		api("org.htmlunit:htmlunit:4.10.0")
diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringBeanContainer.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringBeanContainer.java
index 727d05d22ca..f83a3f5d3dc 100644
--- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringBeanContainer.java
+++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/SpringBeanContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -259,6 +259,12 @@ public final class SpringBeanContainer implements BeanContainer {
 			return this.beanInstance;
 		}
 
+		@Override
+		@SuppressWarnings("unchecked")
+		public Class<B> getBeanClass() {
+			return (Class<B>) this.beanInstance.getClass();
+		}
+
 		public void destroyIfNecessary() {
 			if (this.destructionCallback != null) {
 				this.destructionCallback.accept(this.beanInstance);