Skip to content

Commit 5b286ed

Browse files
philwebbwilkinsona
authored andcommitted
Create spring-boot-hibernate module
Issue: 46154
1 parent 4838046 commit 5b286ed

File tree

70 files changed

+704
-741
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+704
-741
lines changed

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ include "spring-boot-project:spring-boot-gson"
9595
include "spring-boot-project:spring-boot-h2console"
9696
include "spring-boot-project:spring-boot-hateoas"
9797
include "spring-boot-project:spring-boot-hazelcast"
98+
include "spring-boot-project:spring-boot-hibernate"
9899
include "spring-boot-project:spring-boot-http-client"
99100
include "spring-boot-project:spring-boot-http-converter"
100101
include "spring-boot-project:spring-boot-http-codec"

spring-boot-project/spring-boot-batch/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies {
3333
implementation(project(":spring-boot-project:spring-boot-tx"))
3434

3535
optional(project(":spring-boot-project:spring-boot-autoconfigure"))
36-
optional(project(":spring-boot-project:spring-boot-jpa"))
36+
optional(project(":spring-boot-project:spring-boot-hibernate"))
3737
optional(project(":spring-boot-project:spring-boot-observation"))
3838

3939
testImplementation(project(":spring-boot-project:spring-boot-flyway"))

spring-boot-project/spring-boot-batch/src/main/java/org/springframework/boot/batch/autoconfigure/BatchAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
* @since 4.0.0
7171
*/
7272
@AutoConfiguration(after = TransactionAutoConfiguration.class,
73-
afterName = "org.springframework.boot.jpa.autoconfigure.hibernate.HibernateJpaAutoConfiguration")
73+
afterName = "org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration")
7474
@ConditionalOnClass({ JobLauncher.class, DataSource.class, DatabasePopulator.class })
7575
@ConditionalOnBean({ DataSource.class, PlatformTransactionManager.class })
7676
@ConditionalOnMissingBean(value = DefaultBatchConfiguration.class, annotation = EnableBatchProcessing.class)

spring-boot-project/spring-boot-batch/src/test/java/org/springframework/boot/batch/autoconfigure/BatchAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@
6161
import org.springframework.boot.batch.autoconfigure.BatchAutoConfiguration.SpringBootBatchConfiguration;
6262
import org.springframework.boot.batch.autoconfigure.domain.City;
6363
import org.springframework.boot.flyway.autoconfigure.FlywayAutoConfiguration;
64+
import org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration;
6465
import org.springframework.boot.jdbc.DataSourceBuilder;
6566
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
6667
import org.springframework.boot.jdbc.autoconfigure.DataSourceTransactionManagerAutoConfiguration;
6768
import org.springframework.boot.jdbc.autoconfigure.EmbeddedDataSourceConfiguration;
6869
import org.springframework.boot.jdbc.init.DataSourceScriptDatabaseInitializer;
69-
import org.springframework.boot.jpa.autoconfigure.hibernate.HibernateJpaAutoConfiguration;
7070
import org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration;
7171
import org.springframework.boot.sql.init.DatabaseInitializationMode;
7272
import org.springframework.boot.sql.init.DatabaseInitializationSettings;

spring-boot-project/spring-boot-cache/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies {
3535
optional(project(":spring-boot-project:spring-boot-data-couchbase"))
3636
optional(project(":spring-boot-project:spring-boot-data-redis"))
3737
optional(project(":spring-boot-project:spring-boot-hazelcast"))
38-
optional(project(":spring-boot-project:spring-boot-jpa"))
38+
optional(project(":spring-boot-project:spring-boot-hibernate"))
3939
optional(project(":spring-boot-project:spring-boot-metrics"))
4040
optional("com.hazelcast:hazelcast-spring")
4141
optional("io.micrometer:micrometer-core")

spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/CacheAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
@AutoConfiguration(afterName = { "org.springframework.boot.data.couchbase.autoconfigure.CouchbaseDataAutoConfiguration",
5555
"org.springframework.boot.data.redis.autoconfigure.RedisAutoConfiguration",
5656
"org.springframework.boot.hazelcast.autoconfigure.HazelcastAutoConfiguration",
57-
"org.springframework.boot.jpa.autoconfigure.hibernate.HibernateJpaAutoConfiguration" })
57+
"org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration" })
5858
@ConditionalOnClass(CacheManager.class)
5959
@ConditionalOnBean(CacheAspectSupport.class)
6060
@ConditionalOnMissingBean(value = CacheManager.class, name = "cacheResolver")

spring-boot-project/spring-boot-data-jpa/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ description = "Spring Boot Data JPA"
2727

2828
dependencies {
2929
api(project(":spring-boot-project:spring-boot-data-commons"))
30-
api(project(":spring-boot-project:spring-boot-jpa"))
30+
api(project(":spring-boot-project:spring-boot-hibernate"))
3131
api("org.springframework.data:spring-data-jpa")
3232
api("org.springframework:spring-aspects")
3333

spring-boot-project/spring-boot-data-jpa/src/main/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3131
import org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration;
3232
import org.springframework.boot.data.jpa.autoconfigure.JpaRepositoriesAutoConfiguration.JpaRepositoriesImportSelector;
33+
import org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration;
3334
import org.springframework.boot.jpa.autoconfigure.EntityManagerFactoryBuilderCustomizer;
34-
import org.springframework.boot.jpa.autoconfigure.hibernate.HibernateJpaAutoConfiguration;
3535
import org.springframework.context.annotation.Bean;
3636
import org.springframework.context.annotation.Conditional;
3737
import org.springframework.context.annotation.Import;

spring-boot-project/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/AbstractJpaRepositoriesAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import org.springframework.boot.data.jpa.autoconfigure.domain.city.City;
2828
import org.springframework.boot.data.jpa.autoconfigure.domain.city.CityRepository;
2929
import org.springframework.boot.data.jpa.autoconfigure.domain.country.Country;
30+
import org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration;
3031
import org.springframework.boot.jdbc.autoconfigure.EmbeddedDataSourceConfiguration;
31-
import org.springframework.boot.jpa.autoconfigure.hibernate.HibernateJpaAutoConfiguration;
3232
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3333
import org.springframework.context.annotation.Bean;
3434
import org.springframework.context.annotation.Configuration;

spring-boot-project/spring-boot-data-jpa/src/test/java/org/springframework/boot/data/jpa/autoconfigure/JpaRepositoriesSpringDataWebAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import org.springframework.boot.data.jpa.autoconfigure.domain.city.City;
2424
import org.springframework.boot.data.jpa.autoconfigure.domain.city.CityRepository;
2525
import org.springframework.boot.data.web.autoconfigure.SpringDataWebAutoConfiguration;
26+
import org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration;
2627
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
27-
import org.springframework.boot.jpa.autoconfigure.hibernate.HibernateJpaAutoConfiguration;
2828
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
2929
import org.springframework.context.annotation.Configuration;
3030
import org.springframework.data.geo.Distance;

0 commit comments

Comments
 (0)