Merge branch 'eugenp:master' into master

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

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

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
+spring.sql.init.data-locations=import_*_users.sql

persistence-modules/spring-data-cassandra/pom.xml

@@ -16,46 +16,15 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-cassandra</artifactId>
-            <version>${org.springframework.data.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>${spring.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-cassandra</artifactId>
+            <version>${spring-boot-starter-data-cassandra.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
             <version>${spring.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-expression</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -91,17 +60,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.datastax.cassandra</groupId>
-            <artifactId>cassandra-driver-core</artifactId>
-            <version>${cassandra-driver-core.version}</version>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
 
     <properties>
-        <org.springframework.data.version>1.3.2.RELEASE</org.springframework.data.version>
-        <cassandra-driver-core.version>2.1.5</cassandra-driver-core.version>
+        <spring-boot-starter-data-cassandra.version>1.3.2.RELEASE</spring-boot-starter-data-cassandra.version>
         <cassandra-unit-spring.version>2.1.9.2</cassandra-unit-spring.version>
         <cassandra-unit-shaded.version>2.1.9.2</cassandra-unit-shaded.version>
         <hector-core.version>2.0-0</hector-core.version>

persistence-modules/spring-data-jpa-annotations/src/main/resources/ddd.properties

@@ -1 +1 @@
-spring.datasource.initialization-mode=never
+spring.sql.init.mode=never

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

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

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

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;

persistence-modules/spring-jdbc/README.md

@@ -4,3 +4,4 @@
 - [Spring JDBC](https://www.baeldung.com/spring-jdbc-jdbctemplate)
 - [Spring JdbcTemplate Unit Testing](https://www.baeldung.com/spring-jdbctemplate-testing)
 - [Using a List of Values in a JdbcTemplate IN Clause](https://www.baeldung.com/spring-jdbctemplate-in-list)
+- [Obtaining Auto-generated Keys in Spring JDBC](https://www.baeldung.com/spring-jdbc-autogenerated-keys)

persistence-modules/spring-jpa/README.md

@@ -6,7 +6,6 @@
 - [Sorting with JPA](https://www.baeldung.com/jpa-sort)
 - [Self-Contained Testing Using an In-Memory Database](https://www.baeldung.com/spring-jpa-test-in-memory-database)
 - [A Guide to Spring AbstractRoutingDatasource](https://www.baeldung.com/spring-abstract-routing-data-source)
-- [Obtaining Auto-generated Keys in Spring JDBC](https://www.baeldung.com/spring-jdbc-autogenerated-keys)
 - [Spring Data Annotations](http://www.baeldung.com/spring-data-annotations)
 - More articles: [[next -->]](/spring-jpa-2)