spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-08 10:19:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0.x'

Browse Source 
Closes gh-48700
This commit is contained in:
Andy Wilkinson
2026-01-08 12:01:09 +00:00
parent d3bb525bc9 9bd1a460a1
commit ef1f4e2fa2
45 changed files with 95 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/CustomHibernateJpaAutoConfigurationTests.java
+1 -1
View File
@@ -31,9 +31,9 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.TestAutoConfigurationPackage;
import org.springframework.boot.hibernate.autoconfigure.test.city.City;
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
import org.springframework.boot.jpa.autoconfigure.JpaProperties;
import org.springframework.boot.jpa.autoconfigure.test.city.City;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/HibernateJpaAutoConfigurationTests.java
+4 -4
View File
@@ -73,6 +73,9 @@ import org.springframework.boot.hibernate.SpringJtaPlatform;
import org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfigurationTests.JpaUsingApplicationListenerConfiguration.EventCapturingApplicationListener;
import org.springframework.boot.hibernate.autoconfigure.HibernateJpaConfiguration.Hibernate72RuntimeHints;
import org.springframework.boot.hibernate.autoconfigure.HibernateJpaConfiguration.HibernateRuntimeHints;
import org.springframework.boot.hibernate.autoconfigure.mapping.NonAnnotatedEntity;
import org.springframework.boot.hibernate.autoconfigure.test.city.City;
import org.springframework.boot.hibernate.autoconfigure.test.country.Country;
import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
import org.springframework.boot.jdbc.autoconfigure.DataSourceInitializationAutoConfiguration;
@@ -82,9 +85,6 @@ import org.springframework.boot.jpa.EntityManagerFactoryBuilder;
import org.springframework.boot.jpa.autoconfigure.EntityManagerFactoryBuilderCustomizer;
import org.springframework.boot.jpa.autoconfigure.JpaBaseConfiguration;
import org.springframework.boot.jpa.autoconfigure.JpaProperties;
import org.springframework.boot.jpa.autoconfigure.hibernate.mapping.NonAnnotatedEntity;
import org.springframework.boot.jpa.autoconfigure.test.city.City;
import org.springframework.boot.jpa.autoconfigure.test.country.Country;
import org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration;
import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitialization;
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
@@ -655,7 +655,7 @@ class HibernateJpaAutoConfigurationTests {
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence/orm https://www.oracle.com/webfolder/technetwork/jsc/xml/ns/persistence/orm_2_1.xsd"
version="2.1">
<entity class="org.springframework.boot.jpa.autoconfigure.hibernate.mapping.NonAnnotatedEntity">
<entity class="org.springframework.boot.hibernate.autoconfigure.mapping.NonAnnotatedEntity">
<table name="NON_ANNOTATED"/>
<attributes>
<id name="id">
module/spring-boot-hibernate/src/test/java/org/springframework/boot/jpa/autoconfigure/hibernate/mapping/NonAnnotatedEntity.java → module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/mapping/NonAnnotatedEntity.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.jpa.autoconfigure.hibernate.mapping;
package org.springframework.boot.hibernate.autoconfigure.mapping;
/**
* A non annotated entity that is handled by a custom "mapping-file".
module/spring-boot-hibernate/src/test/java/org/springframework/boot/jpa/autoconfigure/test/city/City.java → module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/test/city/City.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.jpa.autoconfigure.test.city;
package org.springframework.boot.hibernate.autoconfigure.test.city;
import java.io.Serializable;
module/spring-boot-hibernate/src/test/java/org/springframework/boot/jpa/autoconfigure/test/city/CityListener.java → module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/test/city/CityListener.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.jpa.autoconfigure.test.city;
package org.springframework.boot.hibernate.autoconfigure.test.city;
import jakarta.persistence.PostLoad;
module/spring-boot-hibernate/src/test/java/org/springframework/boot/jpa/autoconfigure/test/country/Country.java → module/spring-boot-hibernate/src/test/java/org/springframework/boot/hibernate/autoconfigure/test/country/Country.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.jpa.autoconfigure.test.country;
package org.springframework.boot.hibernate.autoconfigure.test.country;
import java.io.Serializable;