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 'ebean/master' into pr/enh/post_process_find_controller

Browse Source
This commit is contained in:
Jonas Pöhler
2021-09-14 15:37:43 +02:00
parent a4eeda6449 512ba24041
commit 38139850de
15 changed files with 25 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-api/pom.xml
+1 -1
View File
@@ -27,7 +27,7 @@
<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-config</artifactId>
<version>1.3</version>
<version>1.4</version>
</dependency>
<!--
ebean-core/pom.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-ddl-runner</artifactId>
<version>1.1</version>
<version>1.2</version>
</dependency>
<dependency>
ebean-ddl-generator/pom.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-ddl-runner</artifactId>
<version>1.1</version>
<version>1.2</version>
</dependency>
<dependency>
ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/DbMigrationTest.java
+2 -2
View File
@@ -1,9 +1,9 @@
package io.ebeaninternal.dbmigration;
import io.ebean.BaseTestCase;
import io.localtest.BaseTestCase;
import io.ebean.SqlRow;
import io.ebean.SqlUpdate;
import io.ebean.annotation.IgnorePlatform;
import io.localtest.annotation.IgnorePlatform;
import io.ebean.annotation.Platform;
import io.ebeaninternal.dbmigration.ddlgeneration.Helper;
import org.junit.jupiter.api.Test;
ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/ddlgeneration/BaseDdlHandlerTest.java
+1 -1
View File
@@ -1,6 +1,6 @@
package io.ebeaninternal.dbmigration.ddlgeneration;
import io.ebean.BaseTestCase;
import io.localtest.BaseTestCase;
import io.ebean.DB;
import io.ebean.config.DatabaseConfig;
import io.ebean.config.dbplatform.DatabasePlatform;
ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuildBeanVisitorTest.java
+1 -1
View File
@@ -1,7 +1,7 @@
package io.ebeaninternal.dbmigration.model.build;
import io.ebean.BaseTestCase;
import io.localtest.BaseTestCase;
import io.ebean.DB;
import io.ebean.DatabaseFactory;
import io.ebean.config.DatabaseConfig;
ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compoundKeyTest.java
+1 -1
View File
@@ -1,7 +1,7 @@
package io.ebeaninternal.dbmigration.model.build;
import io.ebean.BaseTestCase;
import io.localtest.BaseTestCase;
import io.ebean.DatabaseFactory;
import io.ebean.config.DatabaseConfig;
import io.ebeaninternal.api.SpiEbeanServer;
ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_compound_IdClassTest.java
+1 -7
View File
@@ -1,21 +1,15 @@
package io.ebeaninternal.dbmigration.model.build;
import io.ebean.BaseTestCase;
import io.localtest.BaseTestCase;
import io.ebean.DatabaseFactory;
import io.ebean.config.DatabaseConfig;
import io.ebeaninternal.api.SpiEbeanServer;
import io.ebeaninternal.dbmigration.ddlgeneration.Helper;
import io.ebeaninternal.dbmigration.migration.Migration;
import io.ebeaninternal.dbmigration.migrationreader.MigrationXmlReader;
import io.ebeaninternal.dbmigration.model.CurrentModel;
import io.ebeaninternal.dbmigration.model.MTable;
import io.ebeaninternal.dbmigration.model.ModelContainer;
import org.junit.jupiter.api.Test;
import org.tests.model.basic.CKeyAssoc;
import org.tests.model.basic.CKeyDetail;
import org.tests.model.basic.CKeyParent;
import org.tests.model.basic.CKeyParentId;
import org.tests.model.compositekeys.CKEmbId;
import org.tests.model.compositekeys.CKSiteUser;
ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/build/ModelBuild_explicitSequencesTest.java
+1 -1
View File
@@ -1,7 +1,7 @@
package io.ebeaninternal.dbmigration.model.build;
import io.ebean.BaseTestCase;
import io.localtest.BaseTestCase;
import io.ebean.DatabaseFactory;
import io.ebean.config.DatabaseConfig;
import io.ebeaninternal.api.SpiEbeanServer;
ebean-ddl-generator/src/test/java/io/ebean/BaseTestCase.java → ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java
+3 -13
View File
@@ -1,25 +1,15 @@
package io.ebean;
package io.localtest;
import io.ebean.DB;
import io.ebean.Database;
import io.ebean.annotation.PersistBatch;
import io.ebean.annotation.Platform;
import io.ebean.cache.ServerCacheStatistics;
import io.ebean.config.dbplatform.IdType;
import io.ebean.meta.MetaTimedMetric;
import io.ebean.meta.ServerMetrics;
import io.ebean.util.StringHelper;
import io.ebeaninternal.api.SpiEbeanServer;
import io.ebeaninternal.api.SpiTransaction;
import io.ebeaninternal.server.deploy.BeanDescriptor;
import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
import io.ebeaninternal.server.expression.platform.DbExpressionHandlerFactory;
import org.assertj.core.api.AbstractCharSequenceAssert;
import org.junit.jupiter.api.extension.ExtendWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.sql.Types;
import java.util.List;
import java.util.stream.Collectors;
import static org.assertj.core.api.Assertions.assertThat;
ebean-ddl-generator/src/test/java/io/ebean/dbmigration/DbMigrationSqlServerTest.java → ebean-ddl-generator/src/test/java/io/localtest/DbMigrationSqlServerTest.java
+2 -1
View File
@@ -1,6 +1,7 @@
package io.ebean.dbmigration;
package io.localtest;
import io.ebean.annotation.Platform;
import io.ebean.dbmigration.DbMigration;
import io.ebeaninternal.api.DbOffline;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
ebean-ddl-generator/src/test/java/io/ebean/PlatformCondition.java → ebean-ddl-generator/src/test/java/io/localtest/PlatformCondition.java
+3 -2
View File
@@ -1,6 +1,7 @@
package io.ebean;
package io.localtest;
import io.ebean.annotation.ForPlatform;
import io.ebean.DB;
import io.localtest.annotation.ForPlatform;
import io.ebean.annotation.Platform;
import org.junit.jupiter.api.extension.ConditionEvaluationResult;
import org.junit.jupiter.api.extension.ExecutionCondition;
ebean-ddl-generator/src/test/java/io/ebean/annotation/ForPlatform.java → ebean-ddl-generator/src/test/java/io/localtest/annotation/ForPlatform.java
+3 -1
View File
@@ -1,4 +1,6 @@
package io.ebean.annotation;
package io.localtest.annotation;
import io.ebean.annotation.Platform;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
ebean-ddl-generator/src/test/java/io/ebean/annotation/IgnorePlatform.java → ebean-ddl-generator/src/test/java/io/localtest/annotation/IgnorePlatform.java
+3 -1
View File
@@ -1,4 +1,6 @@
package io.ebean.annotation;
package io.localtest.annotation;
import io.ebean.annotation.Platform;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
pom.xml
+1 -1
View File
@@ -40,7 +40,7 @@
<properties>
<nexus.staging.autoReleaseAfterClose>true</nexus.staging.autoReleaseAfterClose>
<jackson.version>2.12.1</jackson.version>
<ebean-ddl-runner.version>1.0</ebean-ddl-runner.version>
<ebean-ddl-runner.version>1.2</ebean-ddl-runner.version>
<ebean-migration-auto.version>1.1</ebean-migration-auto.version>
<ebean-migration.version>12.11.0</ebean-migration.version>
<ebean-test-docker.version>4.1</ebean-test-docker.version>