Roland Praml ea9036dd5d Merge remote-tracking branch 'upstream/master' into ebean-new ...

# Conflicts:
#	ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java
#	ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java
#	ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlPlugin.java
#	ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
#	ebean-test/src/test/java/io/ebean/json/EJsonTests.java

2022-01-13 13:54:40 +01:00

..

src

Merge remote-tracking branch 'upstream/master' into ebean-new

2022-01-13 13:54:40 +01:00

pom.xml

[maven-release-plugin] prepare for next development iteration

2022-01-12 13:47:13 +01:00

test-dummy2.yaml

Refactor move into ebean-core directory (#2066)

2020-10-08 21:31:18 +13:00

test-dummy.properties

Refactor move into ebean-core directory (#2066)

2020-10-08 21:31:18 +13:00

test-dummy.yml

Refactor move into ebean-core directory (#2066)

2020-10-08 21:31:18 +13:00