mirror of
https://github.com/ebean-orm/ebean.git
synced 2024-04-21 10:51:47 +00:00
Roland Praml
090f3cddb8
# Conflicts: # ebean-bom/pom.xml # ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java # ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java # ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.1.sql # ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.3.sql # ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/idx_db2.migrations # ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java # ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java # tests/test-java16/pom.xml # tests/test-kotlin/pom.xml