Merge branch 'master' into wip/EntityBeanIntercept-interface

This commit is contained in:
Rob Bygrave authored and GitHub committed 2022-04-13 10:43:13 +12:00
commit 9862526352
51 files changed
+230 -207

No files matched your search

+5 -5
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>composites</artifactId> <artifactId>composites</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>ebean-clickhouse</name> <name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -35,13 +35,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId> <artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-clickhouse</artifactId> <artifactId>ebean-platform-clickhouse</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+5 -5
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>composites</artifactId> <artifactId>composites</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>ebean-cockroach</name> <name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -35,13 +35,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId> <artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-postgres</artifactId> <artifactId>ebean-platform-postgres</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+5 -5
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>composites</artifactId> <artifactId>composites</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>ebean-db2</name> <name>ebean-db2</name>
@@ -16,13 +16,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -35,13 +35,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId> <artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-db2</artifactId> <artifactId>ebean-platform-db2</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+5 -5
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>composites</artifactId> <artifactId>composites</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>ebean-h2</name> <name>ebean-h2</name>
@@ -16,13 +16,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -35,13 +35,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId> <artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-h2</artifactId> <artifactId>ebean-platform-h2</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+5 -5
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>composites</artifactId> <artifactId>composites</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>ebean-hana</name> <name>ebean-hana</name>
@@ -16,13 +16,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -35,13 +35,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId> <artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-hana</artifactId> <artifactId>ebean-platform-hana</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+5 -5
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>composites</artifactId> <artifactId>composites</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>ebean-mariadb</name> <name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -35,13 +35,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId> <artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-mariadb</artifactId> <artifactId>ebean-platform-mariadb</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+5 -5
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>composites</artifactId> <artifactId>composites</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>ebean-mysql</name> <name>ebean-mysql</name>
@@ -16,13 +16,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -35,13 +35,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId> <artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-mysql</artifactId> <artifactId>ebean-platform-mysql</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+5 -5
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>composites</artifactId> <artifactId>composites</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>ebean-nuodb</name> <name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -35,13 +35,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId> <artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-nuodb</artifactId> <artifactId>ebean-platform-nuodb</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+5 -5
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>composites</artifactId> <artifactId>composites</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>ebean-oracle</name> <name>ebean-oracle</name>
@@ -16,13 +16,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -35,13 +35,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId> <artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-oracle</artifactId> <artifactId>ebean-platform-oracle</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+5 -5
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>composites</artifactId> <artifactId>composites</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>ebean-postgres</name> <name>ebean-postgres</name>
@@ -16,13 +16,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -35,13 +35,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId> <artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-postgres</artifactId> <artifactId>ebean-platform-postgres</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+5 -5
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>composites</artifactId> <artifactId>composites</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>ebean-sqlite</name> <name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -35,13 +35,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId> <artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-sqlite</artifactId> <artifactId>ebean-platform-sqlite</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+5 -5
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>composites</artifactId> <artifactId>composites</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>ebean-sqlserver</name> <name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -35,13 +35,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId> <artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-sqlserver</artifactId> <artifactId>ebean-platform-sqlserver</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+5 -5
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>composites</artifactId> <artifactId>composites</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>ebean-yugabyte</name> <name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -35,13 +35,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId> <artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-postgres</artifactId> <artifactId>ebean-platform-postgres</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+5 -5
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>composites</artifactId> <artifactId>composites</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>ebean (all platforms)</name> <name>ebean (all platforms)</name>
@@ -16,13 +16,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -35,13 +35,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId> <artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-all</artifactId> <artifactId>ebean-platform-all</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+1 -1
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>composites</artifactId> <artifactId>composites</artifactId>
+1 -1
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>ebean api</name> <name>ebean api</name>
+3 -3
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<!-- <parent>--> <!-- <parent>-->
<!-- <groupId>org.avaje</groupId>--> <!-- <groupId>org.avaje</groupId>-->
@@ -26,7 +26,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@@ -55,7 +55,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-h2</artifactId> <artifactId>ebean-platform-h2</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
+15 -15
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>ebean bom</name> <name>ebean bom</name>
@@ -71,88 +71,88 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean</artifactId> <artifactId>ebean</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core-type</artifactId> <artifactId>ebean-core-type</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-ddl-generator</artifactId> <artifactId>ebean-ddl-generator</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-externalmapping-api</artifactId> <artifactId>ebean-externalmapping-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-externalmapping-xml</artifactId> <artifactId>ebean-externalmapping-xml</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-autotune</artifactId> <artifactId>ebean-autotune</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId> <artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>querybean-generator</artifactId> <artifactId>querybean-generator</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>kotlin-querybean-generator</artifactId> <artifactId>kotlin-querybean-generator</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId> <artifactId>ebean-test</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-postgis</artifactId> <artifactId>ebean-postgis</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-redis</artifactId> <artifactId>ebean-redis</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+2 -2
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>ebean-core-type</artifactId> <artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
+7 -7
View File
@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
@@ -41,19 +41,19 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core-type</artifactId> <artifactId>ebean-core-type</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-externalmapping-api</artifactId> <artifactId>ebean-externalmapping-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -144,21 +144,21 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-h2</artifactId> <artifactId>ebean-platform-h2</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-postgres</artifactId> <artifactId>ebean-platform-postgres</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-sqlserver</artifactId> <artifactId>ebean-platform-sqlserver</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@@ -524,7 +524,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
} }
if (result instanceof BeanList) { if (result instanceof BeanList) {
OrderBy<T> orderBy = query.getOrderBy(); OrderBy<T> orderBy = query.getOrderBy();
if (orderBy != null) { if (orderBy != null && !orderBy.isEmpty()) {
// in memory sort after merging the cache hits with the DB hits // in memory sort after merging the cache hits with the DB hits
beanDescriptor.sort(((BeanList<T>) result).getActualList(), orderBy.toStringFormat()); beanDescriptor.sort(((BeanList<T>) result).getActualList(), orderBy.toStringFormat());
} }
@@ -543,7 +543,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
@Override @Override
public List<T> beanCacheHits() { public List<T> beanCacheHits() {
OrderBy<T> orderBy = query.getOrderBy(); OrderBy<T> orderBy = query.getOrderBy();
if (orderBy != null) { if (orderBy != null && !orderBy.isEmpty()) {
beanDescriptor.sort(cacheBeans, orderBy.toStringFormat()); beanDescriptor.sort(cacheBeans, orderBy.toStringFormat());
} }
return cacheBeans; return cacheBeans;
@@ -552,7 +552,7 @@ public final class OrmQueryRequest<T> extends BeanRequest implements SpiOrmQuery
@Override @Override
public <K> Map<K, T> beanCacheHitsAsMap() { public <K> Map<K, T> beanCacheHitsAsMap() {
OrderBy<T> orderBy = query.getOrderBy(); OrderBy<T> orderBy = query.getOrderBy();
if (orderBy != null) { if (orderBy != null && !orderBy.isEmpty()) {
beanDescriptor.sort(cacheBeans, orderBy.toStringFormat()); beanDescriptor.sort(cacheBeans, orderBy.toStringFormat());
} }
return cacheBeansToMap(); return cacheBeansToMap();
@@ -7,12 +7,14 @@ import javax.persistence.DiscriminatorType;
import java.sql.Types; import java.sql.Types;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Set;
import java.util.TreeSet;
/** /**
* Represents a node in the Inheritance tree. * Represents a node in the Inheritance tree.
* Holds information regarding Super Subclass support. * Holds information regarding Super Subclass support.
*/ */
public final class DeployInheritInfo { public final class DeployInheritInfo implements Comparable<DeployInheritInfo> {
/** /**
* the default discriminator column according to the JPA 1.0 spec. * the default discriminator column according to the JPA 1.0 spec.
@@ -27,7 +29,7 @@ public final class DeployInheritInfo {
private String columnDefn; private String columnDefn;
private final Class<?> type; private final Class<?> type;
private Class<?> parent; private Class<?> parent;
private final ArrayList<DeployInheritInfo> children = new ArrayList<>(); private final Set<DeployInheritInfo> children = new TreeSet<>();
/** /**
* Create for a given type. * Create for a given type.
@@ -74,7 +76,7 @@ public final class DeployInheritInfo {
/** /**
* Return the child nodes. * Return the child nodes.
*/ */
public List<DeployInheritInfo> children() { public Set<DeployInheritInfo> children() {
return children; return children;
} }
@@ -251,7 +253,22 @@ public final class DeployInheritInfo {
@Override @Override
public String toString() { public String toString() {
return "InheritInfo[" + type.getName() + "]" + " root[" + parent.getName() + "]" + " disValue[" + discriminatorStringValue + "]"; String root = parent == null ? null : parent.getName();
String name = type == null ? null : type.getName();
return "InheritInfo[" + name + "]" + " root[" + root + "]" + " disValue[" + discriminatorStringValue + "]";
}
@Override
public int compareTo(DeployInheritInfo o) {
if (o == this || o.discriminatorStringValue == null && discriminatorStringValue == null) {
return 0;
} else if (o.discriminatorStringValue == null) {
return 1;
} else if (discriminatorStringValue == null) {
return -1;
} else {
return discriminatorStringValue.compareTo(o.discriminatorStringValue);
}
} }
} }
+4 -4
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>ebean ddl generation</name> <name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core-type</artifactId> <artifactId>ebean-core-type</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@@ -58,7 +58,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-all</artifactId> <artifactId>ebean-platform-all</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
+1 -1
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>ebean external mapping api</name> <name>ebean external mapping api</name>
+5 -5
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<scm> <scm>
@@ -28,7 +28,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-externalmapping-api</artifactId> <artifactId>ebean-externalmapping-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -61,21 +61,21 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-h2</artifactId> <artifactId>ebean-platform-h2</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-ddl-generator</artifactId> <artifactId>ebean-ddl-generator</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
+4 -5
View File
@@ -2,19 +2,18 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ebean-kotlin</artifactId> <artifactId>ebean-kotlin</artifactId>
<properties> <properties>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<!-- <ebean-maven-plugin.version>13.0.1-SNAPSHOT</ebean-maven-plugin.version>-->
<kotlin.version>1.6.0</kotlin.version> <kotlin.version>1.6.0</kotlin.version>
</properties> </properties>
@@ -29,7 +28,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@@ -51,7 +50,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId> <artifactId>ebean-test</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
+4 -4
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>ebean postgis</name> <name>ebean postgis</name>
@@ -22,14 +22,14 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-postgres</artifactId> <artifactId>ebean-platform-postgres</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<!-- provided scope --> <!-- provided scope -->
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@@ -73,7 +73,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId> <artifactId>ebean-test</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
+5 -5
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>ebean querybean</name> <name>ebean querybean</name>
@@ -17,7 +17,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@@ -63,21 +63,21 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-ddl-generator</artifactId> <artifactId>ebean-ddl-generator</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>querybean-generator</artifactId> <artifactId>querybean-generator</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId> <artifactId>ebean-test</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
+6 -6
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>ebean-redis</artifactId> <artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId> <artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>querybean-generator</artifactId> <artifactId>querybean-generator</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId> <artifactId>ebean-test</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
+5 -5
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>ebean test</name> <name>ebean test</name>
@@ -29,20 +29,20 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-h2</artifactId> <artifactId>ebean-platform-h2</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-ddl-generator</artifactId> <artifactId>ebean-ddl-generator</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -106,7 +106,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-all</artifactId> <artifactId>ebean-platform-all</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@@ -6,6 +6,7 @@ import io.ebean.OrderBy;
import io.ebean.Query; import io.ebean.Query;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.tests.model.basic.Order; import org.tests.model.basic.Order;
import org.tests.model.basic.OrderDetail;
import org.tests.model.basic.ResetBasicData; import org.tests.model.basic.ResetBasicData;
import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -37,5 +38,18 @@ public class TestOrderByClear extends BaseTestCase {
assertTrue(sql.contains("order by t0.ship_date")); assertTrue(sql.contains("order by t0.ship_date"));
} }
@Test
public void testWithCache() {
ResetBasicData.reset();
Query<OrderDetail> query = DB.find(OrderDetail.class).where().idIn(1,2,3).query();
query.setUseCache(true);
query.findList();
query.order().asc("cretime").findList(); // hit cache
query.order().clear();
query.findList(); // hit cache again
}
} }
+4 -4
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>kotlin querybean generator</name> <name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId> <artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@@ -43,7 +43,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@@ -64,7 +64,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-ddl-generator</artifactId> <artifactId>ebean-ddl-generator</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
+14 -14
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>platforms</artifactId> <artifactId>platforms</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>ebean-platform-all</artifactId> <artifactId>ebean-platform-all</artifactId>
@@ -14,67 +14,67 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-h2</artifactId> <artifactId>ebean-platform-h2</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-clickhouse</artifactId> <artifactId>ebean-platform-clickhouse</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-db2</artifactId> <artifactId>ebean-platform-db2</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-hana</artifactId> <artifactId>ebean-platform-hana</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-hsqldb</artifactId> <artifactId>ebean-platform-hsqldb</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-mysql</artifactId> <artifactId>ebean-platform-mysql</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-mariadb</artifactId> <artifactId>ebean-platform-mariadb</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-nuodb</artifactId> <artifactId>ebean-platform-nuodb</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-oracle</artifactId> <artifactId>ebean-platform-oracle</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-postgres</artifactId> <artifactId>ebean-platform-postgres</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-sqlanywhere</artifactId> <artifactId>ebean-platform-sqlanywhere</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-sqlite</artifactId> <artifactId>ebean-platform-sqlite</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-sqlserver</artifactId> <artifactId>ebean-platform-sqlserver</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+2 -2
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>platforms</artifactId> <artifactId>platforms</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>ebean-platform-clickhouse</artifactId> <artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,7 +14,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+2 -2
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>platforms</artifactId> <artifactId>platforms</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>ebean-platform-db2</artifactId> <artifactId>ebean-platform-db2</artifactId>
@@ -14,7 +14,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+2 -2
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>platforms</artifactId> <artifactId>platforms</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>ebean-platform-h2</artifactId> <artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<!-- Provided scope so that the H2HistoryTrigger can live in Ebean core <!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
+2 -2
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>platforms</artifactId> <artifactId>platforms</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>ebean-platform-hana</artifactId> <artifactId>ebean-platform-hana</artifactId>
@@ -14,7 +14,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+2 -2
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>platforms</artifactId> <artifactId>platforms</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>ebean-platform-hsqldb</artifactId> <artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,7 +14,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-h2</artifactId> <artifactId>ebean-platform-h2</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+3 -3
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>platforms</artifactId> <artifactId>platforms</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>ebean-platform-mariadb</artifactId> <artifactId>ebean-platform-mariadb</artifactId>
@@ -14,13 +14,13 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-platform-mysql</artifactId> <artifactId>ebean-platform-mysql</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+2 -2
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>platforms</artifactId> <artifactId>platforms</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>ebean-platform-mysql</artifactId> <artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
+2 -2
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>platforms</artifactId> <artifactId>platforms</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>ebean-platform-nuodb</artifactId> <artifactId>ebean-platform-nuodb</artifactId>
@@ -14,7 +14,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+2 -2
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>platforms</artifactId> <artifactId>platforms</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>ebean-platform-oracle</artifactId> <artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
+1 -1
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>platforms</artifactId> <artifactId>platforms</artifactId>
+2 -2
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>platforms</artifactId> <artifactId>platforms</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>ebean-platform-postgres</artifactId> <artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
+2 -2
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>platforms</artifactId> <artifactId>platforms</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>ebean-platform-sqlanywhere</artifactId> <artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,7 +14,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+2 -2
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>platforms</artifactId> <artifactId>platforms</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>ebean-platform-sqlite</artifactId> <artifactId>ebean-platform-sqlite</artifactId>
@@ -14,7 +14,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
+2 -2
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>platforms</artifactId> <artifactId>platforms</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<artifactId>ebean-platform-sqlserver</artifactId> <artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId> <artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
+1 -1
View File
@@ -9,7 +9,7 @@
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>ebean parent</name> <name>ebean parent</name>
+1 -1
View File
@@ -4,7 +4,7 @@
<parent> <parent>
<artifactId>ebean-parent</artifactId> <artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</parent> </parent>
<name>querybean generator</name> <name>querybean generator</name>
+7 -13
View File
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<!-- <parent>-->
<!-- <groupId>org.avaje</groupId>-->
<!-- <artifactId>java11-oss</artifactId>-->
<!-- <version>2.3</version>-->
<!-- </parent>-->
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>test-java16</artifactId> <artifactId>test-java16</artifactId>
@@ -13,26 +9,25 @@
<properties> <properties>
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version> <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
<maven.deploy.skip>true</maven.deploy.skip>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean</artifactId> <artifactId>ebean</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
<version>1.2.10</version> <version>1.2.11</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId> <artifactId>ebean-test</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@@ -58,7 +53,7 @@
<path> <path>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>querybean-generator</artifactId> <artifactId>querybean-generator</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
</path> </path>
</annotationProcessorPaths> </annotationProcessorPaths>
</configuration> </configuration>
@@ -71,8 +66,7 @@
<extensions>true</extensions> <extensions>true</extensions>
<configuration> <configuration>
<tiles> <tiles>
<!-- other tiles ... --> <tile>io.ebean.tile:enhancement:13.3.0</tile>
<tile>io.ebean.tile:enhancement:13.0.1-RC1</tile>
</tiles> </tiles>
</configuration> </configuration>
</plugin> </plugin>
+4 -5
View File
@@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.avaje</groupId> <groupId>org.avaje</groupId>
<artifactId>java11-oss</artifactId> <artifactId>java11-oss</artifactId>
<version>3.4</version> <version>3.7</version>
<relativePath/> <relativePath/>
</parent> </parent>
@@ -19,10 +19,9 @@
<maven.compiler.source>11</maven.compiler.source> <maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target> <maven.compiler.target>11</maven.compiler.target>
<ebean-maven-plugin.version>13.0.1-RC1</ebean-maven-plugin.version> <ebean-maven-plugin.version>13.3.0</ebean-maven-plugin.version>
<kotlin.version>1.6.0</kotlin.version> <kotlin.version>1.6.0</kotlin.version>
<jackson.version>2.12.1</jackson.version> <jackson.version>2.12.1</jackson.version>
<maven.deploy.skip>true</maven.deploy.skip>
</properties> </properties>
<dependencies> <dependencies>
@@ -36,14 +35,14 @@
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId> <artifactId>ebean-test</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.ebean</groupId> <groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId> <artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version> <version>13.3.1-SNAPSHOT</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>