From cd3868d8635de8c98e1ccdddafff0776982be62f Mon Sep 17 00:00:00 2001 From: Shashank Date: Thu, 14 Oct 2021 19:08:58 +0530 Subject: [PATCH 1/6] Spring Boot 2.5.x compatible updates in spring-boot-persistence --- .../src/test/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/persistence-modules/spring-boot-persistence/src/test/resources/application.properties b/persistence-modules/spring-boot-persistence/src/test/resources/application.properties index 07101ca2f5..d22bd38426 100644 --- a/persistence-modules/spring-boot-persistence/src/test/resources/application.properties +++ b/persistence-modules/spring-boot-persistence/src/test/resources/application.properties @@ -13,4 +13,4 @@ hibernate.cache.use_query_cache=true hibernate.cache.region.factory_class=org.hibernate.cache.ehcache.EhCacheRegionFactory spring.jpa.properties.hibernate.hbm2ddl.import_files=import_books.sql -spring.datasource.data=import_*_users.sql \ No newline at end of file +spring.sql.init.data-locations=import_*_users.sql \ No newline at end of file From 8c5391ca7534f68df0553f05050e36939ed9e210 Mon Sep 17 00:00:00 2001 From: Shashank Date: Thu, 14 Oct 2021 20:09:00 +0530 Subject: [PATCH 2/6] Spring Boot 2.5.x compatible updates in spring-data-jpa-repo --- .../com/baeldung/boot/daos/JpaRepositoriesIntegrationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/boot/daos/JpaRepositoriesIntegrationTest.java b/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/boot/daos/JpaRepositoriesIntegrationTest.java index 9e4b78dce3..fe02f79a56 100644 --- a/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/boot/daos/JpaRepositoriesIntegrationTest.java +++ b/persistence-modules/spring-data-jpa-repo/src/test/java/com/baeldung/boot/daos/JpaRepositoriesIntegrationTest.java @@ -21,7 +21,7 @@ import com.baeldung.boot.domain.Location; import com.baeldung.boot.domain.Store; @RunWith(SpringRunner.class) -@DataJpaTest(properties="spring.datasource.data=classpath:import_entities.sql") +@DataJpaTest(properties="spring.sql.init.data-locations=classpath:import_entities.sql") public class JpaRepositoriesIntegrationTest { @Autowired private LocationRepository locationRepository; From 40aa009be24b008c2b60ca633b82387c9e3b30b7 Mon Sep 17 00:00:00 2001 From: Shashank Date: Fri, 15 Oct 2021 09:16:33 +0530 Subject: [PATCH 3/6] Spring Boot 2.5.x compatible updates in spring-data-jpa-query --- .../src/main/resources/application-joins.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/persistence-modules/spring-data-jpa-query/src/main/resources/application-joins.properties b/persistence-modules/spring-data-jpa-query/src/main/resources/application-joins.properties index fe2270293b..5fc1fd78e0 100644 --- a/persistence-modules/spring-data-jpa-query/src/main/resources/application-joins.properties +++ b/persistence-modules/spring-data-jpa-query/src/main/resources/application-joins.properties @@ -1 +1 @@ -spring.datasource.data=classpath:db/import_joins.sql +spring.sql.init.data-locations=classpath:db/import_joins.sql From df95f2e2a83ffad9de7fd698640ee3952059d76f Mon Sep 17 00:00:00 2001 From: Shashank Date: Fri, 15 Oct 2021 09:24:10 +0530 Subject: [PATCH 4/6] Spring Boot 2.5.x compatible updates in spring-data-jpa-query-2 --- .../spring/data/jpa/query/UserRepositoryIntegrationTest.java | 2 +- .../jpa/query/datetime/ArticleRepositoryIntegrationTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/data/jpa/query/UserRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/data/jpa/query/UserRepositoryIntegrationTest.java index 0ede418acd..a9ab13feed 100644 --- a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/data/jpa/query/UserRepositoryIntegrationTest.java +++ b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/data/jpa/query/UserRepositoryIntegrationTest.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @RunWith(SpringRunner.class) -@DataJpaTest(properties = "spring.datasource.data=classpath:insert_users.sql") +@DataJpaTest(properties = "spring.sql.init.data-locations=classpath:insert_users.sql") public class UserRepositoryIntegrationTest { @Autowired diff --git a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/data/jpa/query/datetime/ArticleRepositoryIntegrationTest.java b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/data/jpa/query/datetime/ArticleRepositoryIntegrationTest.java index b1158b3dae..e00a340615 100644 --- a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/data/jpa/query/datetime/ArticleRepositoryIntegrationTest.java +++ b/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/spring/data/jpa/query/datetime/ArticleRepositoryIntegrationTest.java @@ -17,7 +17,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @RunWith(SpringRunner.class) -@DataJpaTest(properties="spring.datasource.data=classpath:import_entities.sql") +@DataJpaTest(properties="spring.sql.init.data-locations=classpath:import_entities.sql") public class ArticleRepositoryIntegrationTest { @Autowired From b5ed1148cc072f8bdf1bfd9c97a59dc5b82b4eac Mon Sep 17 00:00:00 2001 From: Shashank Date: Fri, 15 Oct 2021 09:46:03 +0530 Subject: [PATCH 5/6] Spring Boot 2.5.x compatible updates in spring-boot-persistence-h2 --- .../resources/application-lazy-load-no-trans-off.properties | 2 +- .../main/resources/application-lazy-load-no-trans-on.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/persistence-modules/spring-boot-persistence-h2/src/main/resources/application-lazy-load-no-trans-off.properties b/persistence-modules/spring-boot-persistence-h2/src/main/resources/application-lazy-load-no-trans-off.properties index ca60ef3ce3..a1243dc1df 100644 --- a/persistence-modules/spring-boot-persistence-h2/src/main/resources/application-lazy-load-no-trans-off.properties +++ b/persistence-modules/spring-boot-persistence-h2/src/main/resources/application-lazy-load-no-trans-off.properties @@ -5,7 +5,7 @@ spring.datasource.password= spring.jpa.hibernate.ddl-auto=create-drop spring.h2.console.enabled=true spring.h2.console.path=/h2-console -spring.datasource.data=data-trans.sql +spring.sql.init.data-locations=data-trans.sql logging.level.org.hibernate.SQL=INFO logging.level.org.hibernate.type=INFO diff --git a/persistence-modules/spring-boot-persistence-h2/src/main/resources/application-lazy-load-no-trans-on.properties b/persistence-modules/spring-boot-persistence-h2/src/main/resources/application-lazy-load-no-trans-on.properties index 0469ea0dde..2ea89b2ee6 100644 --- a/persistence-modules/spring-boot-persistence-h2/src/main/resources/application-lazy-load-no-trans-on.properties +++ b/persistence-modules/spring-boot-persistence-h2/src/main/resources/application-lazy-load-no-trans-on.properties @@ -5,7 +5,7 @@ spring.datasource.password= spring.jpa.hibernate.ddl-auto=create-drop spring.h2.console.enabled=true spring.h2.console.path=/h2-console -spring.datasource.data=data-trans.sql +spring.sql.init.data-locations=data-trans.sql logging.level.org.hibernate.SQL=INFO logging.level.org.hibernate.type=INFO From 4bd4abe9839b38335d8f7b206ed6a48956e67694 Mon Sep 17 00:00:00 2001 From: Shashank Date: Fri, 15 Oct 2021 09:51:04 +0530 Subject: [PATCH 6/6] Spring Boot 2.5.x compatible updates in spring-data-jpa-annotations --- .../src/main/resources/ddd.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/persistence-modules/spring-data-jpa-annotations/src/main/resources/ddd.properties b/persistence-modules/spring-data-jpa-annotations/src/main/resources/ddd.properties index e5126b694b..af14453993 100644 --- a/persistence-modules/spring-data-jpa-annotations/src/main/resources/ddd.properties +++ b/persistence-modules/spring-data-jpa-annotations/src/main/resources/ddd.properties @@ -1 +1 @@ -spring.datasource.initialization-mode=never \ No newline at end of file +spring.sql.init.mode=never \ No newline at end of file