From 6e31de6f2ef8ba24bc6780e31e4b2071443b8ec1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Dec 2021 04:33:53 +0000 Subject: [PATCH 1/7] Bump h2 from 1.4.199 to 2.0.202 in /ebean-test Bumps [h2](https://github.com/h2database/h2database) from 1.4.199 to 2.0.202. - [Release notes](https://github.com/h2database/h2database/releases) - [Commits](https://github.com/h2database/h2database/compare/version-1.4.199...version-2.0.202) --- updated-dependencies: - dependency-name: com.h2database:h2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- ebean-test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index af698ce97..c91ff68b9 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -76,7 +76,7 @@ com.h2database h2 - 1.4.199 + 2.0.202 From 6a9b5944a3b1d2be077dd236da15d6d3d5a025b2 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 17 Dec 2021 20:55:19 +1300 Subject: [PATCH 2/7] Remove release.properties that somehow got into git after release --- release.properties | 83 ---------------------------------------------- 1 file changed, 83 deletions(-) delete mode 100644 release.properties diff --git a/release.properties b/release.properties deleted file mode 100644 index e846a5665..000000000 --- a/release.properties +++ /dev/null @@ -1,83 +0,0 @@ -#release configuration -#Fri Dec 17 17:24:24 NZDT 2021 -projectVersionPolicyId=default -project.scm.io.ebean\:ebean-core-type.tag=HEAD -scm.branchCommitComment=@{prefix} prepare branch @{releaseLabel} -project.rel.io.ebean\:ebean-ddl-generator=12.13.2 -project.dev.io.ebean\:ebean-core=12.13.3-SNAPSHOT -project.scm.io.ebean\:ebean-api.tag=HEAD -project.scm.io.ebean\:ebean-redis.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.scm.io.ebean\:ebean-querybean.tag=HEAD -project.scm.io.ebean\:ebean-api.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.dev.io.ebean\:ebean-api=12.13.3-SNAPSHOT -project.rel.io.ebean\:ebean=12.13.2 -project.dev.io.ebean\:ebean-core-type=12.13.3-SNAPSHOT -project.scm.io.ebean\:ebean-ddl-generator.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -exec.activateProfiles=release -project.dev.io.ebean\:ebean-test=12.13.3-SNAPSHOT -project.scm.io.ebean\:kotlin-querybean-generator.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.scm.io.ebean\:ebean-querybean.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.scm.io.ebean\:ebean-bom.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.scm.io.ebean\:ebean-core.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.rel.io.ebean\:ebean-core-type=12.13.2 -project.rel.io.ebean\:kotlin-querybean-generator=12.13.2 -project.dev.io.ebean\:querybean-generator=12.13.3-SNAPSHOT -project.scm.io.ebean\:ebean-autotune.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -scm.commentPrefix=[maven-release-plugin] -releaseStrategyId=default -project.rel.io.ebean\:ebean-querybean=12.13.2 -project.scm.io.ebean\:ebean-externalmapping-api.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.scm.io.ebean\:querybean-generator.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.dev.io.ebean\:kotlin-querybean-generator=12.13.3-SNAPSHOT -project.scm.io.ebean\:ebean-core-type.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -completedPhase=generate-release-poms -project.rel.io.ebean\:ebean-redis=12.13.2 -project.scm.io.ebean\:ebean-test.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.scm.io.ebean\:ebean-postgis.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.dev.io.ebean\:ebean-autotune=12.13.3-SNAPSHOT -project.rel.io.ebean\:ebean-api=12.13.2 -project.scm.io.ebean\:ebean-postgis.tag=HEAD -project.scm.io.ebean\:querybean-generator.tag=HEAD -project.rel.io.ebean\:querybean-generator=12.13.2 -scm.tag=ebean-parent-12.13.2 -project.rel.io.ebean\:ebean-externalmapping-xml=12.13.2 -project.scm.io.ebean\:ebean-ddl-generator.tag=HEAD -project.rel.io.ebean\:ebean-externalmapping-api=12.13.2 -project.scm.io.ebean\:ebean-externalmapping-xml.tag=HEAD -preparationGoals=clean verify -exec.pomFileName=pom.xml -project.dev.io.ebean\:ebean-externalmapping-api=12.13.3-SNAPSHOT -project.dev.io.ebean\:ebean=12.13.3-SNAPSHOT -project.scm.io.ebean\:ebean.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.dev.io.ebean\:ebean-parent=12.13.3-SNAPSHOT -project.dev.io.ebean\:ebean-externalmapping-xml=12.13.3-SNAPSHOT -project.rel.io.ebean\:ebean-core=12.13.2 -project.dev.io.ebean\:ebean-redis=12.13.3-SNAPSHOT -project.dev.io.ebean\:ebean-postgis=12.13.3-SNAPSHOT -project.scm.io.ebean\:ebean-redis.tag=HEAD -project.scm.io.ebean\:ebean-parent.tag=HEAD -pushChanges=true -project.scm.io.ebean\:ebean-externalmapping-xml.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.rel.io.ebean\:ebean-test=12.13.2 -project.scm.io.ebean\:kotlin-querybean-generator.tag=HEAD -project.scm.io.ebean\:ebean-bom.tag=HEAD -project.scm.io.ebean\:ebean-autotune.tag=HEAD -project.scm.io.ebean\:ebean.tag=HEAD -project.scm.io.ebean\:ebean-core.tag=HEAD -project.rel.io.ebean\:ebean-autotune=12.13.2 -scm.rollbackCommitComment=@{prefix} rollback the release of @{releaseLabel} -remoteTagging=true -project.dev.io.ebean\:ebean-bom=12.13.3-SNAPSHOT -project.dev.io.ebean\:ebean-querybean=12.13.3-SNAPSHOT -project.rel.io.ebean\:ebean-bom=12.13.2 -project.scm.io.ebean\:ebean-parent.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -scm.url=scm\:git\:git@github.com\:ebean-orm/ebean.git -scm.developmentCommitComment=@{prefix} prepare for next development iteration -project.scm.io.ebean\:ebean-externalmapping-api.tag=HEAD -scm.tagNameFormat=@{project.artifactId}-@{project.version} -project.scm.io.ebean\:ebean-test.tag=HEAD -project.dev.io.ebean\:ebean-ddl-generator=12.13.3-SNAPSHOT -exec.snapshotReleasePluginAllowed=false -scm.releaseCommitComment=@{prefix} prepare release @{releaseLabel} -project.rel.io.ebean\:ebean-postgis=12.13.2 -project.rel.io.ebean\:ebean-parent=12.13.2 From bd01dfd29a107dc1f02bf3e6b9b53de13afd5f49 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 17 Dec 2021 20:57:46 +1300 Subject: [PATCH 3/7] Bump parent pom, moved to s01.oss.sonatype.org --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ce0f1cd64..1b48a5474 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.avaje java8-oss - 3.2 + 3.3 io.ebean From 752d5d4782cd35b10d1275fe7e2c09adbdf689ee Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 17 Dec 2021 21:47:07 +1300 Subject: [PATCH 4/7] Remove pom.xml.releaseBackup from barfed release --- ebean-api/pom.xml.releaseBackup | 130 --------- ebean-autotune/pom.xml.releaseBackup | 74 ----- ebean-bom/pom.xml.releaseBackup | 162 ----------- ebean-core-type/pom.xml.releaseBackup | 46 --- ebean-core/pom.xml.releaseBackup | 247 ----------------- ebean-ddl-generator/pom.xml.releaseBackup | 106 ------- .../pom.xml.releaseBackup | 30 -- .../pom.xml.releaseBackup | 100 ------- ebean-postgis/pom.xml.releaseBackup | 118 -------- ebean-querybean/pom.xml.releaseBackup | 112 -------- ebean-redis/pom.xml.releaseBackup | 93 ------- ebean-test/pom.xml.releaseBackup | 261 ------------------ ebean/pom.xml.releaseBackup | 58 ---- .../pom.xml.releaseBackup | 186 ------------- pom.xml.releaseBackup | 114 -------- querybean-generator/pom.xml.releaseBackup | 52 ---- 16 files changed, 1889 deletions(-) delete mode 100644 ebean-api/pom.xml.releaseBackup delete mode 100644 ebean-autotune/pom.xml.releaseBackup delete mode 100644 ebean-bom/pom.xml.releaseBackup delete mode 100644 ebean-core-type/pom.xml.releaseBackup delete mode 100644 ebean-core/pom.xml.releaseBackup delete mode 100644 ebean-ddl-generator/pom.xml.releaseBackup delete mode 100644 ebean-externalmapping-api/pom.xml.releaseBackup delete mode 100644 ebean-externalmapping-xml/pom.xml.releaseBackup delete mode 100644 ebean-postgis/pom.xml.releaseBackup delete mode 100644 ebean-querybean/pom.xml.releaseBackup delete mode 100644 ebean-redis/pom.xml.releaseBackup delete mode 100644 ebean-test/pom.xml.releaseBackup delete mode 100644 ebean/pom.xml.releaseBackup delete mode 100644 kotlin-querybean-generator/pom.xml.releaseBackup delete mode 100644 pom.xml.releaseBackup delete mode 100644 querybean-generator/pom.xml.releaseBackup diff --git a/ebean-api/pom.xml.releaseBackup b/ebean-api/pom.xml.releaseBackup deleted file mode 100644 index 1e711bc62..000000000 --- a/ebean-api/pom.xml.releaseBackup +++ /dev/null @@ -1,130 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - ebean api - ebean api - ebean-api - - - - - - org.slf4j - slf4j-api - 1.7.30 - provided - - - - io.avaje - avaje-config - 1.5 - - - - - io.avaje - avaje-lang - 1.0 - - - - io.ebean - persistence-api - 2.2.5 - - - - io.ebean - ebean-annotation - 7.3 - - - - io.ebean - ebean-types - 2.2 - - - - io.ebean - ebean-datasource-api - ${ebean-datasource.version} - - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - true - - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - true - - - - - com.h2database - h2 - 1.4.199 - true - - - - javax.transaction - jta - 1.1 - true - - - - javax.servlet - javax.servlet-api - 3.1.0 - true - - - - io.avaje - junit - 1.0 - test - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.avaje.tile:moditech-module:1.0 - - - - - - diff --git a/ebean-autotune/pom.xml.releaseBackup b/ebean-autotune/pom.xml.releaseBackup deleted file mode 100644 index dc7b6c0ac..000000000 --- a/ebean-autotune/pom.xml.releaseBackup +++ /dev/null @@ -1,74 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - - - - - - - scm:git:git@github.com:ebean-orm/ebean.git - HEAD - - - ebean autotune - ebean automatic query tuning module - ebean-autotune - - - - - io.ebean - ebean-core - 12.13.2-SNAPSHOT - provided - - - - - org.glassfish.jaxb - jaxb-runtime - 2.3.2 - provided - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - io.avaje - junit - 1.0 - test - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.ebean.tile:enhancement:12.11.3 - io.avaje.tile:moditech-module:1.0 - - - - - - - diff --git a/ebean-bom/pom.xml.releaseBackup b/ebean-bom/pom.xml.releaseBackup deleted file mode 100644 index 417420c68..000000000 --- a/ebean-bom/pom.xml.releaseBackup +++ /dev/null @@ -1,162 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - ebean bom - ebean bill of materials pom - ebean-bom - pom - - - - - - - - - io.ebean - ebean-ddl-runner - ${ebean-ddl-runner.version} - - - - io.ebean - ebean-migration-auto - ${ebean-migration-auto.version} - - - - io.ebean - ebean-migration - ${ebean-migration.version} - - - - io.ebean - ebean-datasource-api - ${ebean-datasource.version} - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - - - - io.ebean - ebean-agent - ${ebean-agent.version} - - - - io.ebean - ebean-maven-plugin - ${ebean-maven-plugin.version} - - - - io.ebean - ebean-test-docker - ${ebean-test-docker.version} - - - - - - io.ebean - ebean - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-api - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-core - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-core-type - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-ddl-generator - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-externalmapping-api - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-externalmapping-xml - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-autotune - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-querybean - 12.13.2-SNAPSHOT - - - - io.ebean - querybean-generator - 12.13.2-SNAPSHOT - provided - - - - io.ebean - kotlin-querybean-generator - 12.13.2-SNAPSHOT - provided - - - - io.ebean - ebean-test - 12.13.2-SNAPSHOT - test - - - - io.ebean - ebean-postgis - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-redis - 12.13.2-SNAPSHOT - - - - - - - diff --git a/ebean-core-type/pom.xml.releaseBackup b/ebean-core-type/pom.xml.releaseBackup deleted file mode 100644 index 3d3e11a75..000000000 --- a/ebean-core-type/pom.xml.releaseBackup +++ /dev/null @@ -1,46 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - ebean-core-type - ebean core type - ebean scalar types api - - - - - io.ebean - ebean-api - 12.13.2-SNAPSHOT - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - true - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.avaje.tile:moditech-module:1.0 - - - - - - diff --git a/ebean-core/pom.xml.releaseBackup b/ebean-core/pom.xml.releaseBackup deleted file mode 100644 index b250f7a0a..000000000 --- a/ebean-core/pom.xml.releaseBackup +++ /dev/null @@ -1,247 +0,0 @@ - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - ebean-core - jar - - ebean core - ebean core module - https://ebean.io/ - - - scm:git:git@github.com:ebean-orm/ebean.git - HEAD - - - - - - io.ebean - ebean-ddl-runner - 1.2 - - - - io.avaje - classpath-scanner - 6.2 - - - - io.ebean - ebean-migration-auto - 1.1 - - - - io.ebean - ebean-api - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-core-type - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-externalmapping-api - 12.13.2-SNAPSHOT - - - - org.antlr - antlr4-runtime - 4.8-1 - - - - - io.avaje - avaje-jsr305-x - 1.1 - provided - - - - - com.h2database - h2 - 1.4.199 - provided - - - - javax.transaction - javax.transaction-api - 1.3 - true - - - - - javax.validation - validation-api - 2.0.1.Final - true - - - jakarta.validation - jakarta.validation-api - 3.0.0 - true - - - - joda-time - joda-time - 2.9.7 - true - - - - - - - - - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - true - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - true - - - - - org.postgresql - postgresql - 42.2.24 - true - - - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - io.avaje - junit - 1.0 - test - - - - - - - - - io.ebean - ebean-maven-plugin - ${ebean-maven-plugin.version} - - - test - process-test-classes - - debug=0 - - - testEnhance - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M4 - - false - false - false - - **/Test*.java - **/*Test.java - **/*Tests.java - - - - - datasource.default - ${datasource.default} - - - - dbClockDelta - ${dbClockDelta} - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.1.1 - - Ebean 12 - src/main/java/io/ebean/overview.html - io.ebeaninternal.*:io.ebeanservice:io.ebean.common:io.ebean.bean:io.ebean.service:io.ebean.metric:io.ebean.util:io.ebean.config.properties:io.ebean.config.dbplatform - true - src/main/java/com/avaje/ebean/overview.html - - - - attach-javadocs - - jar - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.avaje.tile:moditech-module:1.0 - - - - - - - - - diff --git a/ebean-ddl-generator/pom.xml.releaseBackup b/ebean-ddl-generator/pom.xml.releaseBackup deleted file mode 100644 index fc0e83a5f..000000000 --- a/ebean-ddl-generator/pom.xml.releaseBackup +++ /dev/null @@ -1,106 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - ebean ddl generation - DDL and DB Migration generation - ebean-ddl-generator - - - - - io.ebean - ebean-ddl-runner - 1.2 - - - - io.ebean - ebean-migration - 12.12.1 - - - - io.ebean - ebean-core-type - 12.13.2-SNAPSHOT - provided - - - - io.ebean - ebean-core - 12.13.2-SNAPSHOT - provided - - - - - org.glassfish.jaxb - jaxb-runtime - 2.3.2 - provided - - - - - io.avaje - junit - 1.0 - test - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - javax.validation - validation-api - 2.0.1.Final - test - - - - - - - - io.ebean - ebean-maven-plugin - ${ebean-maven-plugin.version} - - - test - process-test-classes - - debug=0 - - - testEnhance - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.avaje.tile:moditech-module:1.0 - - - - - - diff --git a/ebean-externalmapping-api/pom.xml.releaseBackup b/ebean-externalmapping-api/pom.xml.releaseBackup deleted file mode 100644 index 72278f50b..000000000 --- a/ebean-externalmapping-api/pom.xml.releaseBackup +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - ebean external mapping api - API for mapping external named queries - ebean-externalmapping-api - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.avaje.tile:moditech-module:1.0 - - - - - - - diff --git a/ebean-externalmapping-xml/pom.xml.releaseBackup b/ebean-externalmapping-xml/pom.xml.releaseBackup deleted file mode 100644 index 8155aa728..000000000 --- a/ebean-externalmapping-xml/pom.xml.releaseBackup +++ /dev/null @@ -1,100 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - - - - - - - scm:git:git@github.com:ebean-orm/ebean.git - HEAD - - - ebean external mapping xml - XML implementation for mapping external named queries - ebean-externalmapping-xml - - - - - org.slf4j - slf4j-api - 1.7.30 - provided - - - - io.ebean - ebean-externalmapping-api - 12.13.2-SNAPSHOT - - - - org.glassfish.jaxb - jaxb-runtime - 2.3.2 - - - - io.avaje - classpath-scanner - 6.2 - - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - io.ebean - ebean-core - 12.13.2-SNAPSHOT - test - - - - io.ebean - ebean-ddl-generator - 12.13.2-SNAPSHOT - test - - - - io.avaje - junit - 1.0 - test - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - - io.ebean.tile:enhancement:12.11.3 - io.avaje.tile:moditech-module:1.0 - - - - - - - diff --git a/ebean-postgis/pom.xml.releaseBackup b/ebean-postgis/pom.xml.releaseBackup deleted file mode 100644 index 3d1fa16d0..000000000 --- a/ebean-postgis/pom.xml.releaseBackup +++ /dev/null @@ -1,118 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - ebean postgis - ebean postgis module - https://ebean.io/ - - ebean-postgis - - - 2.2.1 - - - - - - - io.ebean - ebean-core - 12.13.2-SNAPSHOT - provided - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - true - - - - net.postgis - postgis-jdbc - [${postgis.jdbc.version}] - - - - - org.postgresql - postgresql - 42.2.24 - provided - - - - - org.slf4j - slf4j-api - 1.7.30 - provided - - - - - org.geolatte - geolatte-geom - 1.0.6 - provided - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - io.ebean - ebean-test - 12.13.2-SNAPSHOT - test - - - - org.avaje.composite - logback - 1.1 - test - - - - io.avaje - junit - 1.0 - test - - - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.ebean.tile:enhancement:12.11.3 - io.avaje.tile:moditech-module:1.0 - - - - - - - - - diff --git a/ebean-querybean/pom.xml.releaseBackup b/ebean-querybean/pom.xml.releaseBackup deleted file mode 100644 index 5ed7e1669..000000000 --- a/ebean-querybean/pom.xml.releaseBackup +++ /dev/null @@ -1,112 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - ebean querybean - Ebean querybean support - ebean-querybean - - - - - - io.ebean - ebean-core - 12.13.2-SNAPSHOT - provided - - - - - io.avaje - avaje-lang - 1.0 - - - - joda-time - joda-time - 1.6 - true - - - - javax.validation - validation-api - 2.0.1.Final - true - - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - io.ebean - ebean-ddl-generator - 12.13.2-SNAPSHOT - test - - - - io.ebean - querybean-generator - 12.13.2-SNAPSHOT - test - - - - io.ebean - ebean-test - 12.13.2-SNAPSHOT - test - - - - io.avaje - junit - 1.0 - test - - - - org.avaje.composite - logback - 1.1 - test - - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.ebean.tile:enhancement:12.11.3 - io.avaje.tile:moditech-module:1.0 - - - - - - - - diff --git a/ebean-redis/pom.xml.releaseBackup b/ebean-redis/pom.xml.releaseBackup deleted file mode 100644 index 7ada5696b..000000000 --- a/ebean-redis/pom.xml.releaseBackup +++ /dev/null @@ -1,93 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - ebean-redis - ebean redis - Ebean Redis L2 Cache - - - - - redis.clients - jedis - 3.6.3 - - - - io.ebean - ebean-api - 12.13.2-SNAPSHOT - provided - - - - io.ebean - ebean-core - 12.13.2-SNAPSHOT - provided - - - - io.ebean - ebean-querybean - 12.13.2-SNAPSHOT - test - - - - io.ebean - querybean-generator - 12.13.2-SNAPSHOT - test - - - - io.ebean - ebean-test - 12.13.2-SNAPSHOT - test - - - - io.avaje - junit - 1.0 - test - - - - org.avaje.composite - logback - 1.1 - test - - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.ebean.tile:enhancement:12.11.3 - io.avaje.tile:moditech-module:1.0 - - - - - - - - - diff --git a/ebean-test/pom.xml.releaseBackup b/ebean-test/pom.xml.releaseBackup deleted file mode 100644 index b015a4544..000000000 --- a/ebean-test/pom.xml.releaseBackup +++ /dev/null @@ -1,261 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - ebean test - Testing support for Ebean - ebean-test - - - - - org.slf4j - slf4j-api - 1.7.30 - provided - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - - - - io.ebean - ebean-core - 12.13.2-SNAPSHOT - provided - - - - io.ebean - ebean-ddl-generator - 12.13.2-SNAPSHOT - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - true - - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson.version} - true - - - - io.ebean - ebean-test-docker - 4.3 - - - - org.assertj - assertj-core - 3.14.0 - - - - - org.glassfish.jaxb - jaxb-runtime - 2.3.2 - - - - - com.h2database - h2 - 1.4.199 - - - - - - io.avaje - avaje-jsr305 - 1.1 - test - - - - io.ebean - ebean-migration - 12.12.1 - test - - - - io.avaje - mod-uuid - 1.1 - test - - - - javax.transaction - jta - 1.1 - test - - - - - javax.validation - validation-api - 2.0.1.Final - test - - - - jakarta.validation - jakarta.validation-api - 3.0.0 - test - - - - joda-time - joda-time - 2.9.7 - test - - - - javax.annotation - javax.annotation-api - 1.3.2 - test - - - commons-io - commons-io - 2.7 - test - - - - org.postgresql - postgresql - 42.2.24 - - - org.checkerframework - checker-qual - - - test - - - - com.microsoft.sqlserver - mssql-jdbc - 9.4.0.jre8 - test - - - - mysql - mysql-connector-java - 8.0.26 - test - - - - org.mariadb.jdbc - mariadb-java-client - 2.6.0 - test - - - - com.sap.cloud.db.jdbc - ngdbc - 2.3.48 - test - - - - com.oracle.database.jdbc - - ojdbc8 - 19.12.0.0 - test - - - - com.ibm.db2 - jcc - 11.5.6.0 - test - - - - org.xerial - sqlite-jdbc - 3.36.0.3 - test - - - - com.nuodb.jdbc - nuodb-jdbc - 22.0.0 - test - - - - ru.yandex.clickhouse - clickhouse-jdbc - 0.3.1-patch - test - - - - ch.qos.logback - logback-classic - 1.2.3 - test - - - - io.avaje - junit - 1.0 - test - - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.ebean.tile:enhancement:12.11.3 - io.avaje.tile:moditech-module:1.0 - - - - - - - - diff --git a/ebean/pom.xml.releaseBackup b/ebean/pom.xml.releaseBackup deleted file mode 100644 index bf039e209..000000000 --- a/ebean/pom.xml.releaseBackup +++ /dev/null @@ -1,58 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - ebean composite - Composite of common runtime dependencies - ebean - - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - - - - io.ebean - ebean-api - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-core - 12.13.2-SNAPSHOT - - - - - io.ebean - ebean-querybean - 12.13.2-SNAPSHOT - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.avaje.tile:moditech-module:1.0 - - - - - - diff --git a/kotlin-querybean-generator/pom.xml.releaseBackup b/kotlin-querybean-generator/pom.xml.releaseBackup deleted file mode 100644 index 0be3286f4..000000000 --- a/kotlin-querybean-generator/pom.xml.releaseBackup +++ /dev/null @@ -1,186 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - kotlin querybean generator - Generates Kotlin querybeans - kotlin-querybean-generator - - - 1.6.0 - - - - - - - - io.avaje - junit - 1.0 - test - - - - io.ebean - ebean-querybean - 12.13.2-SNAPSHOT - test - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - io.ebean - ebean-core - 12.13.2-SNAPSHOT - test - - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - ${kotlin.version} - provided - - - - org.jetbrains.kotlin - kotlin-test - ${kotlin.version} - test - - - - io.ebean - ebean-ddl-generator - 12.13.2-SNAPSHOT - test - - - - javax.validation - validation-api - 2.0.1.Final - test - - - - - - - src/test/kotlin - - - org.jetbrains.kotlin - kotlin-maven-plugin - ${kotlin.version} - - - test-compile - test-compile - - test-compile - - - - test-kapt - - test-kapt - - - - src/test/kotlin - - - - io.ebean - kotlin-querybean-generator - 12.8.2 - - - - - - compile - compile - - compile - - - - src/main/java - target/generated-sources/kapt/test - target/generated-sources/kaptKotlin/test - - - - - - 1.8 - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - - default-testCompile - none - - - java-test-compile - test-compile - - testCompile - - - - compile - compile - - compile - - - - - 1.8 - 1.8 - - -proc:none - - - - - io.ebean - ebean-maven-plugin - ${ebean-maven-plugin.version} - - - test - process-test-classes - - debug=1 - - - testEnhance - - - - - - - - - diff --git a/pom.xml.releaseBackup b/pom.xml.releaseBackup deleted file mode 100644 index ba0c11c58..000000000 --- a/pom.xml.releaseBackup +++ /dev/null @@ -1,114 +0,0 @@ - - - 4.0.0 - - org.avaje - java8-oss - 3.2 - - - io.ebean - ebean-parent - 12.13.2-SNAPSHOT - pom - - ebean parent - Parent for ebean modules - https://ebean.io/ - - - scm:git:git@github.com:ebean-orm/ebean.git - HEAD - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - rbygrave - Rob Bygrave - robin.bygrave@gmail.com - - - - - false - 2.12.1 - 1.2 - 1.1 - 12.12.1 - 4.2 - 7.3 - 12.13.0 - 12.13.0 - - - - - - org.slf4j - slf4j-api - 1.7.30 - provided - - - - ch.qos.logback - logback-classic - 1.2.3 - test - - - - com.h2database - h2 - 1.4.199 - test - - - - - - ebean - ebean-api - ebean-bom - ebean-core-type - ebean-core - ebean-ddl-generator - ebean-autotune - ebean-externalmapping-api - ebean-externalmapping-xml - ebean-test - querybean-generator - kotlin-querybean-generator - ebean-querybean - ebean-postgis - ebean-redis - - - - - - - release - - - default - - true - - - ebean-kotlin - tests - - - - - - diff --git a/querybean-generator/pom.xml.releaseBackup b/querybean-generator/pom.xml.releaseBackup deleted file mode 100644 index d61f1d143..000000000 --- a/querybean-generator/pom.xml.releaseBackup +++ /dev/null @@ -1,52 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - querybean generator - Querybean generator - querybean-generator - - - - - io.avaje - junit - 1.0 - test - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.2 - - 1.8 - 1.8 - - -proc:none - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.avaje.tile:moditech-module:1.0 - - - - - - - From 68b7deba9d83ae3610bddfde7b2010a325b743f7 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 17 Dec 2021 23:25:49 +1300 Subject: [PATCH 5/7] Put back h2database to 1.4.199 as 2.x breaks way too many things, need to work on that --- ebean-test/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index c91ff68b9..98d355e3d 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -76,7 +76,7 @@ com.h2database h2 - 2.0.202 + 1.4.199 @@ -187,8 +187,8 @@ com.oracle.database.jdbc - ojdbc8 19.12.0.0 From eb6aacce4bee2f04d7f038dd701240d6d3179846 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Fri, 17 Dec 2021 11:57:23 +0100 Subject: [PATCH 6/7] Provide API to run ddl and migration manually (e.g. with offline DB) --- .../src/main/java/io/ebean/Database.java | 22 +++ .../io/ebeaninternal/api/SpiDdlGenerator.java | 10 +- .../server/core/DefaultServer.java | 51 ++++-- .../server/core/InternalConfiguration.java | 9 +- .../dbmigration/DdlGenerator.java | 40 ++--- .../io/ebean/config/TestServerOffline.java | 151 ++++++++++++++++++ .../io/ebeaninternal/api/TDSpiServer.java | 10 ++ 7 files changed, 249 insertions(+), 44 deletions(-) create mode 100644 ebean-test/src/test/java/io/ebean/config/TestServerOffline.java diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java index 9c69e33fd..31064ee3c 100644 --- a/ebean-api/src/main/java/io/ebean/Database.java +++ b/ebean-api/src/main/java/io/ebean/Database.java @@ -1741,4 +1741,26 @@ public interface Database { */ void truncate(Class... tables); + /** + * Runs the DDL manually. Can be used, if database is offline or if you use a + * TenantMode that does not support DDL run on startup. + *

+ * Note: runDdl is normally executed at startup automatically, if + * ebean.db.runDdl=true is set. Calling this method, will not check + * that flag. + *

+ */ + void runDdl(); + + /** + * Runs the migration manually. Can be used, if database is offline or if you use a + * TenantMode that does not support DDL run on startup. + *

+ * Note: runDdl is normally executed at startup automatically, if + * ebean.db.migration.run=true is set. Calling this method, will not check + * that flag. + *

+ **/ + void runMigration(); + } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiDdlGenerator.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiDdlGenerator.java index b3c485813..6c5d2f43c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiDdlGenerator.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiDdlGenerator.java @@ -8,8 +8,14 @@ public interface SpiDdlGenerator { /** * Generate and run the DDL for drop-all and create-all scripts. *

- * Run based on on property settings for ebean.ddl.generate and ebean.ddl.run etc. + * Run based on on property settings for ebean.ddl.generate */ - void execute(boolean online); + void generateDdl(); + /** + * Runs the created DDL files. + *

+ * Run based on on property settings for ebean.ddl.run etc. + */ + void runDdl(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 1cdabc9f8..1ba14d8e2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -246,7 +246,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { */ public void executePlugins(boolean online) { if (!config.isDocStoreOnly()) { - ddlGenerator.execute(online); + ddlGenerator.generateDdl(); } for (Plugin plugin : serverPlugins) { plugin.online(online); @@ -359,27 +359,54 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { serverCacheManager.enabledRegions(config.getEnabledL2Regions()); } + /** * Start any services after registering with the ClusterManager. */ public void start() { - if (config.isRunMigration() && TenantMode.DB != config.getTenantMode()) { - final AutoMigrationRunner migrationRunner = ServiceUtil.service(AutoMigrationRunner.class); - if (migrationRunner == null) { - throw new IllegalStateException("No AutoMigrationRunner found. Probably ebean-migration is not in the classpath?"); + + // check, if DB is available to run DDL and migration + boolean dbAvailable = !config.isDocStoreOnly() + && !config.isDbOffline() + && config.getDataSource() != null + && config.getTenantMode().isDdlEnabled(); + + if (dbAvailable) { + if (config.isDdlRun()) { + runDdl(); } - final String dbSchema = config.getDbSchema(); - if (dbSchema != null) { - migrationRunner.setDefaultDbSchema(dbSchema); + if (config.isRunMigration()) { + runMigration(); } - migrationRunner.setName(config.getName()); - migrationRunner.setPlatform(config.getDatabasePlatform().getPlatform().base().name().toLowerCase()); - migrationRunner.loadProperties(config.getProperties()); - migrationRunner.run(config.getDataSource()); + } else if (config.isDdlRun() || config.isRunMigration()) { + log.warn("There was a request to run DDL or migration, but this is currently not possible, as the database is not available"); } startQueryPlanCapture(); } + @Override + public void runDdl() { + ddlGenerator.runDdl(); + } + + @Override + public void runMigration() { + final AutoMigrationRunner migrationRunner = ServiceUtil.service(AutoMigrationRunner.class); + if (migrationRunner == null) { + throw new IllegalStateException( + "No AutoMigrationRunner found. Probably ebean-migration is not in the classpath?"); + } + + final String dbSchema = config.getDbSchema(); + if (dbSchema != null) { + migrationRunner.setDefaultDbSchema(dbSchema); + } + migrationRunner.setName(config.getName()); + migrationRunner.setPlatform(config.getDatabasePlatform().getPlatform().base().name().toLowerCase()); + migrationRunner.loadProperties(config.getProperties()); + migrationRunner.run(dataSource()); + } + private void startQueryPlanCapture() { if (config.isQueryPlanCapture()) { long secs = config.getQueryPlanCapturePeriodSecs(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java index 151a7031f..72747f22a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java @@ -610,8 +610,13 @@ public final class InternalConfiguration { } @Override - public void execute(boolean online) { - if (online && ddlRun) { + public void generateDdl() { + // do nothing + } + + @Override + public void runDdl() { + if (ddlRun) { CoreLog.log.error("Configured to run DDL but ebean-ddl-generator is not in the classpath (or ebean-test in the test classpath?)"); } } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java index 69a4af033..71c4ff4f2 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java @@ -41,7 +41,6 @@ public class DdlGenerator implements SpiDdlGenerator { private final SpiEbeanServer server; private final boolean generateDdl; - private final boolean runDdl; private final boolean extraDdl; private final boolean createOnly; private final boolean jaxbPresent; @@ -67,14 +66,7 @@ public class DdlGenerator implements SpiDdlGenerator { final DatabasePlatform databasePlatform = server.databasePlatform(); this.platform = databasePlatform.getPlatform(); this.platformName = platform.base().name(); - if (!config.getTenantMode().isDdlEnabled() && config.isDdlRun()) { - log.warn("DDL can't be run on startup with TenantMode " + config.getTenantMode()); - this.runDdl = false; - this.ddlAutoCommit = false; - } else { - this.runDdl = config.isDdlRun(); - this.ddlAutoCommit = databasePlatform.isDdlAutoCommit(); - } + this.ddlAutoCommit = databasePlatform.isDdlAutoCommit(); this.scriptTransform = createScriptTransform(config); this.baseDir = initBaseDir(); } @@ -89,18 +81,11 @@ public class DdlGenerator implements SpiDdlGenerator { return new File("."); } - @Override - public void execute(boolean online) { - generateDdl(); - if (online) { - runDdl(); - } - } - /** * Generate the DDL drop and create scripts if the properties have been set. */ - protected void generateDdl() { + @Override + public void generateDdl() { if (generateDdl) { if (!createOnly) { writeDrop(getDropFileName()); @@ -112,16 +97,15 @@ public class DdlGenerator implements SpiDdlGenerator { /** * Run the DDL drop and DDL create scripts if properties have been set. */ - protected void runDdl() { - if (runDdl) { - Connection connection = null; - try { - connection = obtainConnection(); - runDdlWith(connection); - } finally { - JdbcClose.rollback(connection); - JdbcClose.close(connection); - } + @Override + public void runDdl() { + Connection connection = null; + try { + connection = obtainConnection(); + runDdlWith(connection); + } finally { + JdbcClose.rollback(connection); + JdbcClose.close(connection); } } diff --git a/ebean-test/src/test/java/io/ebean/config/TestServerOffline.java b/ebean-test/src/test/java/io/ebean/config/TestServerOffline.java new file mode 100644 index 000000000..bed9ab01e --- /dev/null +++ b/ebean-test/src/test/java/io/ebean/config/TestServerOffline.java @@ -0,0 +1,151 @@ +package io.ebean.config; + + +import io.ebean.Database; +import io.ebean.DatabaseFactory; +import io.ebean.annotation.ForPlatform; +import io.ebean.annotation.Platform; +import io.ebean.datasource.DataSourceAlert; +import io.ebean.datasource.DataSourceInitialiseException; + +import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasicVer; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Properties; + +import javax.persistence.PersistenceException; +import javax.sql.DataSource; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +public class TestServerOffline { + + @Test + @ForPlatform({Platform.H2}) + public void testOffline_default() throws SQLException { + + String url = "jdbc:h2:mem:testoffline1"; + try (Connection bootup = DriverManager.getConnection(url, "sa", "secret")) { + Properties props = props(url); + DatabaseConfig config = config(props); + + assertThatThrownBy(() -> DatabaseFactory.create(config)) + .isInstanceOf(DataSourceInitialiseException.class); + } + + } + + private static class LazyDatasourceInitializer implements DataSourceAlert { + + public Database server; + + private boolean initialized; + + @Override + public void dataSourceUp(DataSource dataSource) { + if (!initialized) { + initDatabase(); + } + } + + public synchronized void initDatabase() { + if (!initialized) { + server.runDdl(); + server.runMigration(); + initialized = true; + } + } + + @Override + public void dataSourceDown(DataSource dataSource, SQLException reason) {} + + @Override + public void dataSourceWarning(DataSource dataSource, String msg) {} + + } + + @Test + @ForPlatform({Platform.H2}) + public void testOffline_recovery() throws SQLException { + + String url = "jdbc:h2:mem:testoffline3"; + try (Connection bootup = DriverManager.getConnection(url, "sa", "secret")) { + + Properties props = props(url); + + // to bring up ebean without a database, we must disable varous things + // that happen on startup + props.setProperty("datasource.h2_offline.failOnStart", "false"); + props.setProperty("ebean.h2_offline.skipDataSourceCheck", "true"); + props.setProperty("ebean.h2_offline.ddl.run", "false"); + DatabaseConfig config = config(props); + + LazyDatasourceInitializer alert = new LazyDatasourceInitializer() ; + config.getDataSourceConfig().setAlert(alert); + config.getDataSourceConfig().setHeartbeatFreqSecs(1); + + Database h2Offline = DatabaseFactory.create(config); + alert.server = h2Offline; + assertThat(h2Offline).isNotNull(); + // DB is online now in offline mode + + // Accessing the DB will throw a PE + assertThatThrownBy(() -> alert.initDatabase()) + .isInstanceOf(PersistenceException.class) + .hasMessageContaining("Failed to obtain connection to run DDL"); + + assertThatThrownBy(() -> h2Offline.find(EBasicVer.class).findCount()).isInstanceOf(PersistenceException.class); + + // so - reset the password so that the server can reconnect + try (Statement stmt = bootup.createStatement()) { + stmt.execute("alter user sa set password 'sa'"); + } + + assertThat(alert.initialized).isFalse(); + + // next access to ebean should bring DS online + h2Offline.find(EBasicVer.class).findCount(); + assertThat(alert.initialized).isTrue(); + + // check if server is working (ie ddl was run) + EBasicVer bean = new EBasicVer("foo"); + h2Offline.save(bean); + assertThat(h2Offline.find(EBasicVer.class).findCount()).isEqualTo(1); + h2Offline.delete(bean); + } + } + + private Properties props(String url) { + + Properties props = new Properties(); + + props.setProperty("datasource.h2_offline.username", "sa"); + props.setProperty("datasource.h2_offline.password", "sa"); + props.setProperty("datasource.h2_offline.url", url); + props.setProperty("datasource.h2_offline.driver", "org.h2.Driver"); + + props.setProperty("ebean.h2_offline.databasePlatformName", "h2"); + props.setProperty("ebean.h2_offline.ddl.extra", "false"); + + props.setProperty("ebean.h2_offline.ddl.generate", "true"); + props.setProperty("ebean.h2_offline.ddl.run", "true"); + + return props; + } + + private DatabaseConfig config(Properties props) { + DatabaseConfig config = new DatabaseConfig(); + config.setName("h2_offline"); + config.loadFromProperties(props); + config.setDefaultServer(false); + config.setRegister(false); + config.getClasses().add(EBasicVer.class); + return config; + } + +} diff --git a/ebean-test/src/test/java/io/ebeaninternal/api/TDSpiServer.java b/ebean-test/src/test/java/io/ebeaninternal/api/TDSpiServer.java index 2cf23625b..ba823c057 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/api/TDSpiServer.java +++ b/ebean-test/src/test/java/io/ebeaninternal/api/TDSpiServer.java @@ -642,4 +642,14 @@ public class TDSpiServer implements SpiServer { public void loadBean(EntityBeanIntercept ebi) { } + + @Override + public void runDdl() { + + } + + @Override + public void runMigration() { + + } } From adf14a1f35f0575eb4b321900e6c1b347c2dc311 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Fri, 17 Dec 2021 13:26:30 +0100 Subject: [PATCH 7/7] FIX: javadoc --- ebean-api/src/main/java/io/ebean/Database.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java index 31064ee3c..509fd4764 100644 --- a/ebean-api/src/main/java/io/ebean/Database.java +++ b/ebean-api/src/main/java/io/ebean/Database.java @@ -1746,7 +1746,7 @@ public interface Database { * TenantMode that does not support DDL run on startup. *

* Note: runDdl is normally executed at startup automatically, if - * ebean.db.runDdl=true is set. Calling this method, will not check + * ebean.db.ddl.run=true is set. Calling this method, will not check * that flag. *

*/