github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Roland Praml
2022-04-14 15:29:21 +02:00
parent 62c4acd36a 0e548ec1c5
commit 5b4ac454dd
53 changed files with 228 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composites/ebean-clickhouse/pom.xml
+5 -5
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>composites</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>ebean-clickhouse</name>
@@ -16,13 +16,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -35,13 +35,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-clickhouse</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
composites/ebean-cockroach/pom.xml
+5 -5
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>composites</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>ebean-cockroach</name>
@@ -16,13 +16,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -35,13 +35,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-postgres</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
composites/ebean-db2/pom.xml
+5 -5
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>composites</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>ebean-db2</name>
@@ -16,13 +16,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -35,13 +35,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-db2</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
composites/ebean-h2/pom.xml
+5 -5
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>composites</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>ebean-h2</name>
@@ -16,13 +16,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -35,13 +35,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-h2</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
composites/ebean-hana/pom.xml
+5 -5
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>composites</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>ebean-hana</name>
@@ -16,13 +16,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -35,13 +35,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-hana</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
composites/ebean-mariadb/pom.xml
+5 -5
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>composites</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>ebean-mariadb</name>
@@ -16,13 +16,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -35,13 +35,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-mariadb</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
composites/ebean-mysql/pom.xml
+5 -5
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>composites</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>ebean-mysql</name>
@@ -16,13 +16,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -35,13 +35,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-mysql</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
composites/ebean-nuodb/pom.xml
+5 -5
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>composites</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>ebean-nuodb</name>
@@ -16,13 +16,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -35,13 +35,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-nuodb</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
composites/ebean-oracle/pom.xml
+5 -5
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>composites</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>ebean-oracle</name>
@@ -16,13 +16,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -35,13 +35,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-oracle</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
composites/ebean-postgres/pom.xml
+5 -5
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>composites</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>ebean-postgres</name>
@@ -16,13 +16,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -35,13 +35,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-postgres</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
composites/ebean-sqlite/pom.xml
+5 -5
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>composites</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>ebean-sqlite</name>
@@ -16,13 +16,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -35,13 +35,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-sqlite</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
composites/ebean-sqlserver/pom.xml
+5 -5
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>composites</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>ebean-sqlserver</name>
@@ -16,13 +16,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -35,13 +35,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-sqlserver</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
composites/ebean-yugabyte/pom.xml
+5 -5
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>composites</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>ebean-yugabyte</name>
@@ -16,13 +16,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -35,13 +35,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-postgres</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
composites/ebean/pom.xml
+5 -5
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>composites</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>ebean (all platforms)</name>
@@ -16,13 +16,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -35,13 +35,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-all</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
composites/pom.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<artifactId>composites</artifactId>
ebean-api/pom.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>ebean api</name>
ebean-test/src/test/java/io/ebean/xtest/config/DatabaseConfigTest.java → ebean-api/src/test/java/io/ebean/config/DatabaseConfigTest.java
+7 -12
View File
@@ -1,4 +1,4 @@
package io.ebean.xtest.config;
package io.ebean.config;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.ebean.annotation.MutationDetection;
@@ -17,11 +17,10 @@ import java.util.Properties;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.*;
public class DatabaseConfigTest {
class DatabaseConfigTest {
@Test
public void testLoadFromEbeanProperties() {
void testLoadFromEbeanProperties() {
DatabaseConfig config = new DatabaseConfig();
config.loadFromProperties();
@@ -30,8 +29,7 @@ public class DatabaseConfigTest {
}
@Test
public void evalPropertiesInput() {
void evalPropertiesInput() {
String home = System.getProperty("user.home");
String fileSeparator = System.getProperty("file.separator");
@@ -46,8 +44,7 @@ public class DatabaseConfigTest {
}
@Test
public void testLoadWithProperties() {
void testLoadWithProperties() {
DatabaseConfig config = new DatabaseConfig();
config.setPersistBatch(PersistBatch.NONE);
config.setPersistBatchOnCascade(PersistBatch.NONE);
@@ -154,8 +151,7 @@ public class DatabaseConfigTest {
}
@Test
public void test_defaults() {
void test_defaults() {
DatabaseConfig config = new DatabaseConfig();
assertTrue(config.isIdGeneratorAutomatic());
assertTrue(config.isDefaultServer());
@@ -186,8 +182,7 @@ public class DatabaseConfigTest {
}
@Test
public void test_putServiceObject() {
void test_putServiceObject() {
ObjectMapper objectMapper = new ObjectMapper();
DatabaseConfig config = new DatabaseConfig();
ebean-autotune/pom.xml
+3 -3
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<!-- <parent>-->
<!-- <groupId>org.avaje</groupId>-->
@@ -26,7 +26,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -55,7 +55,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-h2</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
ebean-bom/pom.xml
+15 -15
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>ebean bom</name>
@@ -71,25 +71,25 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core-type</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -101,64 +101,64 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-ddl-generator</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-externalmapping-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-externalmapping-xml</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-autotune</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>querybean-generator</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>kotlin-querybean-generator</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-postgis</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-redis</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
ebean-core-type/pom.xml
+2 -2
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
ebean-core/pom.xml
+7 -7
View File
@@ -3,7 +3,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<artifactId>ebean-core</artifactId>
@@ -35,19 +35,19 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core-type</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-externalmapping-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -138,21 +138,21 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-h2</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-postgres</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-sqlserver</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
ebean-dbmigration-runner/pom.xml
+2 -2
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>ebean dbmigration runner</name>
@@ -29,7 +29,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
ebean-ddl-generator/pom.xml
+5 -5
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>ebean ddl generation</name>
@@ -28,14 +28,14 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core-type</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -58,14 +58,14 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-dbmigration-runner</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-all</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
ebean-externalmapping-api/pom.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>ebean external mapping api</name>
ebean-externalmapping-xml/pom.xml
+5 -5
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<scm>
@@ -28,7 +28,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-externalmapping-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -61,21 +61,21 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-h2</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-ddl-generator</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
ebean-kotlin/pom.xml
+4 -5
View File
@@ -2,19 +2,18 @@
<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>
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ebean-kotlin</artifactId>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<ebean-maven-plugin.version>12.14.1</ebean-maven-plugin.version>
<kotlin.version>1.6.0</kotlin.version>
</properties>
@@ -29,7 +28,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -51,7 +50,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
ebean-postgis/pom.xml
+4 -4
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>ebean postgis</name>
@@ -22,14 +22,14 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-postgres</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<!-- provided scope -->
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -73,7 +73,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
ebean-querybean/pom.xml
+5 -5
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>ebean querybean</name>
@@ -17,7 +17,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -63,21 +63,21 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-ddl-generator</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>querybean-generator</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
ebean-redis/pom.xml
+6 -6
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>querybean-generator</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
ebean-test/pom.xml
+5 -5
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>ebean test</name>
@@ -29,20 +29,20 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-h2</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-ddl-generator</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -106,7 +106,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-all</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
ebean-test/src/main/java/io/ebean/test/config/AutoConfigureForTesting.java
+8 -5
View File
@@ -29,16 +29,17 @@ public class AutoConfigureForTesting implements AutoConfigure {
@Override
public void preConfigure(DatabaseConfig config) {
if (!config.isDefaultServer()) {
log.info("skip automatic testing config on non-default server name:{} register:{}", config.getName(), config.isRegister());
return;
}
Properties properties = config.getProperties();
if (isExtraServer(config, properties)) {
setupExtraDataSourceIfNecessary(config);
return;
}
String testPlatform = properties.getProperty("ebean.test.platform");
log.debug("automatic testing config - with ebean.test.platform:{} environment db:{} name:{}", testPlatform, environmentDb, config.getName());
log.debug("automatic testing config - with ebean.test.platform:{} name:{} environmentDb:{}", testPlatform, config.getName(), environmentDb);
if (RunOnceMarker.isRun()) {
setupPlatform(environmentDb, config);
}
@@ -46,8 +47,10 @@ public class AutoConfigureForTesting implements AutoConfigure {
@Override
public void postConfigure(DatabaseConfig config) {
if (!config.isDefaultServer()) {
return;
}
setupProviders(config);
if (org.h2.engine.Constants.VERSION_MAJOR == 1) {
// This code may be removed later, when droppinv H2 1.xxx compatibility
System.err.println("Running tests in H2 1.xxx compatibility mode");
ebean-test/src/test/java/io/ebean/xtest/BaseTestCase.java
+2
View File
@@ -68,6 +68,8 @@ public abstract class BaseTestCase {
DB_CLOCK_DELTA = 100;
}
try {
String propsFile = System.getProperty("props.file");
System.out.println("BaseTestCase: -Dprops.file=" + propsFile); // help debug CI
// First try, if we get the default server. If this fails, all tests will fail.
DB.getDefault();
} catch (Throwable e) {
ebean-test/src/test/resources/logback-test.xml
+3 -2
View File
@@ -72,11 +72,12 @@
<appender-ref ref="STDOUT"/>
</root>
<logger name="org.tests" level="INFO"/>
<logger name="io.ebean" level="INFO"/>
<logger name="io.avaje.config" level="TRACE"/>
<logger name="io.ebean.docker" level="TRACE"/>
<logger name="io.ebean.test" level="TRACE"/>
<!-- <logger name="io.ebean.DDL" level="DEBUG"/>-->
<!-- <logger name="io.ebean.SQL" level="TRACE"/>-->
kotlin-querybean-generator/pom.xml
+4 -4
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
@@ -43,7 +43,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
@@ -64,7 +64,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-ddl-generator</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
platforms/all/pom.xml
+14 -14
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>platforms</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<artifactId>ebean-platform-all</artifactId>
@@ -14,67 +14,67 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-h2</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-clickhouse</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-db2</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-hana</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-hsqldb</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-mysql</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-mariadb</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-nuodb</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-oracle</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-postgres</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-sqlanywhere</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-sqlite</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-sqlserver</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
platforms/clickhouse/pom.xml
+2 -2
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>platforms</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<artifactId>ebean-platform-clickhouse</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
platforms/db2/pom.xml
+2 -2
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>platforms</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<artifactId>ebean-platform-db2</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
platforms/h2/pom.xml
+2 -2
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>platforms</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<artifactId>ebean-platform-h2</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<!-- Provided scope so that the H2HistoryTrigger can live in Ebean core
platforms/hana/pom.xml
+2 -2
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>platforms</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<artifactId>ebean-platform-hana</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
platforms/hsqldb/pom.xml
+2 -2
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>platforms</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<artifactId>ebean-platform-hsqldb</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-h2</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
platforms/mariadb/pom.xml
+3 -3
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>platforms</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<artifactId>ebean-platform-mariadb</artifactId>
@@ -14,13 +14,13 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-platform-mysql</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
platforms/mysql/pom.xml
+2 -2
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>platforms</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<artifactId>ebean-platform-mysql</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
platforms/nuodb/pom.xml
+2 -2
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>platforms</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<artifactId>ebean-platform-nuodb</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
platforms/oracle/pom.xml
+2 -2
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>platforms</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<artifactId>ebean-platform-oracle</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
platforms/pom.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<artifactId>platforms</artifactId>
platforms/postgres/pom.xml
+2 -2
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>platforms</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<artifactId>ebean-platform-postgres</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
platforms/sqlanywhere/pom.xml
+2 -2
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>platforms</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<artifactId>ebean-platform-sqlanywhere</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
platforms/sqlite/pom.xml
+2 -2
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>platforms</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<artifactId>ebean-platform-sqlite</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
platforms/sqlserver/pom.xml
+2 -2
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>platforms</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<artifactId>ebean-platform-sqlserver</artifactId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
pom.xml
+1 -1
View File
@@ -9,7 +9,7 @@
<groupId>io.ebean</groupId>
<artifactId>ebean-parent</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ebean parent</name>
querybean-generator/pom.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</parent>
<name>querybean generator</name>
tests/test-java16/pom.xml
+19 -11
View File
@@ -1,11 +1,7 @@
<?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>
<!-- <parent>-->
<!-- <groupId>org.avaje</groupId>-->
<!-- <artifactId>java11-oss</artifactId>-->
<!-- <version>2.3</version>-->
<!-- </parent>-->
<groupId>io.ebean</groupId>
<artifactId>test-java16</artifactId>
@@ -13,26 +9,25 @@
<properties>
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<dependencies>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.10</version>
<version>1.2.11</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
@@ -58,11 +53,24 @@
<path>
<groupId>io.ebean</groupId>
<artifactId>querybean-generator</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.24</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.ebean.tile:enhancement:13.3.0</tile>
</tiles>
</configuration>
</plugin>
</plugins>
</build>
tests/test-kotlin/pom.xml
+5 -6
View File
@@ -4,8 +4,8 @@
<parent>
<groupId>org.avaje</groupId>
<artifactId>java11-oss</artifactId>
<version>3.4</version>
<relativePath />
<version>3.7</version>
<relativePath/>
</parent>
<name>test-kotlin</name>
@@ -17,10 +17,9 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<ebean-maven-plugin.version>12.14.1</ebean-maven-plugin.version>
<ebean-maven-plugin.version>13.3.0</ebean-maven-plugin.version>
<kotlin.version>1.6.0</kotlin.version>
<jackson.version>2.12.1</jackson.version>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
<dependencies>
@@ -34,14 +33,14 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>13.3.0-SNAPSHOT</version>
<version>13.3.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>