Merge branch '6.0.x'

# Conflicts: # build.gradle
2023-06-04 18:43:46 +02:00
parent e224c71119 4be813bbee
commit 837327f530
3 changed files with 25 additions and 13 deletions
--- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java
+++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaDialect.java
@@ -110,7 +110,7 @@ public class EclipseLinkJpaDialect extends DefaultJpaDialect {
 			}
 		}

-		return entityManager;
+		return null;
 	}

 	@Override