Merge branch 'master' of https://github.com/eugenp/tutorials into BAEL-14850

persistence-modules/java-cassandra/pom.xml

@@ -39,6 +39,7 @@
         <!-- Cassandra -->
         <cassandra-driver-core.version>3.1.2</cassandra-driver-core.version>
         <cassandra-unit.version>3.1.1.0</cassandra-unit.version>
+        <guava.version>18.0</guava.version>
     </properties>
 
 </project>

persistence-modules/java-jpa/README.md

@@ -8,6 +8,8 @@
 - [Converting Between LocalDate and SQL Date](https://www.baeldung.com/java-convert-localdate-sql-date)
 - [Combining JPA And/Or Criteria Predicates](https://www.baeldung.com/jpa-and-or-criteria-predicates)
 - [Types of JPA Queries](https://www.baeldung.com/jpa-queries)
+- [JPA/Hibernate Projections](https://www.baeldung.com/jpa-hibernate-projections)
+- [Composite Primary Keys in JPA](https://www.baeldung.com/jpa-composite-primary-keys)
 - [Defining JPA Entities](https://www.baeldung.com/jpa-entities)
 - [JPA @Basic Annotation](https://www.baeldung.com/jpa-basic-annotation)
 - [Default Column Values in JPA](https://www.baeldung.com/jpa-default-column-values)

persistence-modules/spring-data-jpa-2/README.md

@@ -1,7 +1,3 @@
-=========
-
-## Spring Data JPA Example Project
-
 ### Relevant Articles: 
 - [Spring Data JPA – Derived Delete Methods](https://www.baeldung.com/spring-data-jpa-deleteby)
 - [JPA Join Types](https://www.baeldung.com/jpa-join-types)
@@ -15,3 +11,4 @@
 - [Spring Data JPA and Named Entity Graphs](https://www.baeldung.com/spring-data-jpa-named-entity-graphs)
 - [Batch Insert/Update with Hibernate/JPA](https://www.baeldung.com/jpa-hibernate-batch-insert-update)
 - [Difference Between save() and saveAndFlush() in Spring Data JPA](https://www.baeldung.com/spring-data-jpa-save-saveandflush)
+- [Derived Query Methods in Spring Data JPA Repositories](https://www.baeldung.com/spring-data-derived-queries)