github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-10-21 13:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/bump-ddl-runner

Browse Source
This commit is contained in:
Rob Bygrave
2022-03-04 10:26:17 +13:00
committed by GitHub
parent f571da5154 61f5442e3b
commit 6ec4e4b965
20 changed files with 76 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-api/pom.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</parent>
<name>ebean api</name>
ebean-autotune/pom.xml
+2 -2
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</parent>
<!-- <parent>-->
<!-- <groupId>org.avaje</groupId>-->
@@ -26,7 +26,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
ebean-bom/pom.xml
+15 -15
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</parent>
<name>ebean bom</name>
@@ -71,88 +71,88 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core-type</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-ddl-generator</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-externalmapping-api</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-externalmapping-xml</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-autotune</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>querybean-generator</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>kotlin-querybean-generator</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-postgis</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-redis</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-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>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</parent>
<artifactId>ebean-core-type</artifactId>
@@ -16,7 +16,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</dependency>
<dependency>
ebean-core/pom.xml
+6 -6
View File
@@ -3,7 +3,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</parent>
<artifactId>ebean-core</artifactId>
@@ -23,7 +23,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-ddl-runner</artifactId>
<version>1.3</version>
<version>${ebean-ddl-runner.version}</version>
</dependency>
<dependency>
@@ -35,25 +35,25 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-migration-auto</artifactId>
<version>1.1</version>
<version>${ebean-migration-auto.version}</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core-type</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-externalmapping-api</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</dependency>
<dependency>
ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java
+3 -1
View File
@@ -373,7 +373,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer {
migrationRunner.setDefaultDbSchema(dbSchema);
}
migrationRunner.setName(config.getName());
migrationRunner.setPlatform(config.getDatabasePlatform().getPlatform().base().name().toLowerCase());
Platform platform = config.getDatabasePlatform().getPlatform();
migrationRunner.setBasePlatform(platform.base().name().toLowerCase());
migrationRunner.setPlatform(platform.name().toLowerCase());
migrationRunner.loadProperties(config.getProperties());
migrationRunner.run(config.getDataSource());
}
ebean-ddl-generator/pom.xml
+4 -4
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</parent>
<name>ebean ddl generation</name>
@@ -16,7 +16,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-ddl-runner</artifactId>
<version>1.3</version>
<version>${ebean-ddl-runner.version}</version>
</dependency>
<dependency>
@@ -28,14 +28,14 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core-type</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>provided</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>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</parent>
<name>ebean external mapping api</name>
ebean-externalmapping-xml/pom.xml
+4 -4
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</parent>
<!-- <parent>-->
<!-- <groupId>org.avaje</groupId>-->
@@ -33,7 +33,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-externalmapping-api</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -59,14 +59,14 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-ddl-generator</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
ebean-kotlin/pom.xml
+3 -3
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -51,7 +51,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
ebean-postgis/pom.xml
+3 -3
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</parent>
<name>ebean postgis</name>
@@ -23,7 +23,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -74,7 +74,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-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>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</parent>
<name>ebean querybean</name>
@@ -17,7 +17,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -56,21 +56,21 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-ddl-generator</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>querybean-generator</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-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>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</parent>
<artifactId>ebean-redis</artifactId>
@@ -22,35 +22,35 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>querybean-generator</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
ebean-test/pom.xml
+3 -3
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</parent>
<name>ebean test</name>
@@ -29,14 +29,14 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-ddl-generator</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</dependency>
<dependency>
ebean/pom.xml
+4 -4
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</parent>
<name>ebean composite</name>
@@ -22,20 +22,20 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-api</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</dependency>
<!-- Technically optional but most expected to use query beans -->
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</dependency>
</dependencies>
kotlin-querybean-generator/pom.xml
+4 -4
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</parent>
<name>kotlin querybean generator</name>
@@ -29,7 +29,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-querybean</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
@@ -43,7 +43,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
@@ -64,7 +64,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-ddl-generator</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
pom.xml
+4 -4
View File
@@ -9,7 +9,7 @@
<groupId>io.ebean</groupId>
<artifactId>ebean-parent</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ebean parent</name>
@@ -42,9 +42,9 @@
<jackson.version>2.12.1</jackson.version>
<h2database.version>2.1.210</h2database.version>
<ebean-ddl-runner.version>1.3</ebean-ddl-runner.version>
<ebean-migration-auto.version>1.1</ebean-migration-auto.version>
<ebean-migration.version>12.15.0</ebean-migration.version>
<ebean-test-docker.version>4.2</ebean-test-docker.version>
<ebean-migration-auto.version>1.2</ebean-migration-auto.version>
<ebean-migration.version>12.16.0</ebean-migration.version>
<ebean-test-docker.version>4.5</ebean-test-docker.version>
<ebean-datasource.version>7.5</ebean-datasource.version>
<ebean-agent.version>12.15.0</ebean-agent.version>
<ebean-maven-plugin.version>12.15.0</ebean-maven-plugin.version>
querybean-generator/pom.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</parent>
<name>querybean generator</name>
tests/test-java16/pom.xml
+3 -3
View File
@@ -20,7 +20,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -32,7 +32,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
@@ -58,7 +58,7 @@
<path>
<groupId>io.ebean</groupId>
<artifactId>querybean-generator</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
</path>
</annotationProcessorPaths>
</configuration>
tests/test-kotlin/pom.xml
+2 -2
View File
@@ -36,14 +36,14 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-test</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>12.15.1-SNAPSHOT</version>
<version>12.16.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>