Merge branch 'master' into BAEL-2804

Conflicts: persistence-modules/java-jpa-2/README.md persistence-modules/java-jpa-2/pom.xml persistence-modules/java-jpa/pom.xml persistence-modules/pom.xml
2019-08-07 22:21:33 -03:00
parent 2a4adf2935 799758881f
commit d25a282447
1749 changed files with 30887 additions and 6138 deletions
@@ -28,7 +28,9 @@
        <module>java-cockroachdb</module>
        <module>java-jdbi</module>
        <module>java-jpa</module>
+        <module>java-jpa-2</module>
        <module>java-mongodb</module>
+        <module>java-sql2o</module>
        <module>jnosql</module>
        <module>liquibase</module>
        <module>orientdb</module>
@@ -56,6 +58,7 @@
        <module>spring-hibernate4</module>
        <module>spring-jpa</module>
        <module>spring-persistence-simple</module>
-        <module>java-jpa-2</module>
+        <module>jpa-hibernate-cascade-type</module>
+				<module>r2dbc</module>
    </modules>
 </project>