Merge branch '6.2.x'

sbrannen · sbrannen · commit 7c83892b9b9a · 2025-10-22T19:16:07.000+02:00
diff --git a/spring-test/src/test/java/org/springframework/test/context/orm/jpa/JpaConfig.java b/spring-test/src/test/java/org/springframework/test/context/orm/jpa/JpaConfig.java
@@ -59,7 +59,7 @@ LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource dataSourc
 		emfb.setPackagesToScan(Person.class.getPackage().getName());
 		HibernateJpaVendorAdapter hibernateJpaVendorAdapter = new HibernateJpaVendorAdapter();
 		hibernateJpaVendorAdapter.setGenerateDdl(true);
-		hibernateJpaVendorAdapter.setDatabase(Database.H2);
+		hibernateJpaVendorAdapter.setDatabase(Database.HSQL);
 		emfb.setJpaVendorAdapter(hibernateJpaVendorAdapter);
 		return emfb;
 	}

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource dataSourc`
`59`	`59`	`emfb.setPackagesToScan(Person.class.getPackage().getName());`
`60`	`60`	`HibernateJpaVendorAdapter hibernateJpaVendorAdapter = new HibernateJpaVendorAdapter();`
`61`	`61`	`hibernateJpaVendorAdapter.setGenerateDdl(true);`
`62`		`- hibernateJpaVendorAdapter.setDatabase(Database.H2);`
	`62`	`+ hibernateJpaVendorAdapter.setDatabase(Database.HSQL);`
`63`	`63`	`emfb.setJpaVendorAdapter(hibernateJpaVendorAdapter);`
`64`	`64`	`return emfb;`
`65`	`65`	`}`