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

# Conflicts:
#	ebean-api/pom.xml
#	ebean-autotune/pom.xml
#	ebean-bom/pom.xml
#	ebean-core-type/pom.xml
#	ebean-core/pom.xml
#	ebean-ddl-generator/pom.xml
#	ebean-externalmapping-api/pom.xml
#	ebean-externalmapping-xml/pom.xml
#	ebean-postgis/pom.xml
#	ebean-querybean/pom.xml
#	ebean-redis/pom.xml
#	ebean-test/pom.xml
#	ebean/pom.xml
#	kotlin-querybean-generator/pom.xml
#	pom.xml
#	querybean-generator/pom.xml
This commit is contained in:
Jonas Pöhler committed 2021-11-04 10:33:04 +01:00
commit 0367ae2a8c
23 files changed
+157 -83

No files matched your search

+3 -3
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>12.12.4-FOC1-SNAPSHOT</version>
<version>12.13.1-SNAPSHOT</version>
</parent>
<name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core-type</artifactId>
<version>12.12.4-FOC1-SNAPSHOT</version>
<version>12.13.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>12.12.4-FOC1-SNAPSHOT</version>
<version>12.13.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>