mirror of
https://github.com/ebean-orm/ebean.git
synced 2024-04-21 10:51:47 +00:00
# Conflicts: # ebean-bom/pom.xml # ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java # ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java # ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java # ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java # ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlPlugin.java # ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java # ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/MysqlGenerateMigrationTest.java # ebean-test/pom.xml # pom.xml # tests/pom.xml # tests/test-java16/pom.xml # tests/test-kotlin/pom.xml