Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	ebean-api/pom.xml
#	ebean-api/src/main/java/io/ebean/config/dbplatform/db2/BaseDB2Platform.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
This commit is contained in:
Roland Praml committed 2022-01-28 07:53:45 +01:00
commit 4493f1b266
35 files changed
+340 -66

No files matched your search

+1 -1
View File
@@ -56,7 +56,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-test-docker</artifactId>
<version>4.4</version>
<version>4.5</version>
</dependency>
<dependency>