From 8252a51545ac621ae07709510fd1a8b35bacafad Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Thu, 29 Nov 2018 10:16:48 +1300 Subject: [PATCH] #1565 - Bump to ebean-datasource 4.3.1 ... with option for owner database credentials and InitDatabase --- pom.xml | 4 ++-- .../io/ebeaninternal/server/core/DefaultContainer.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index efa3a6190..02d86118d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ io.ebean ebean - 11.27.2-SNAPSHOT + 11.28.1-SNAPSHOT jar ebean @@ -123,7 +123,7 @@ io.ebean ebean-datasource - 4.2.2 + 4.3.1 diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java index 9c547e8ae..8be384042 100644 --- a/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java @@ -7,6 +7,10 @@ import io.ebean.config.TenantMode; import io.ebean.config.UnderscoreNamingConvention; import io.ebean.config.dbplatform.DatabasePlatform; import io.ebean.config.dbplatform.h2.H2Platform; +import io.ebean.datasource.DataSourceAlertFactory; +import io.ebean.datasource.DataSourceConfig; +import io.ebean.datasource.DataSourceFactory; +import io.ebean.datasource.DataSourcePoolListener; import io.ebean.service.SpiContainer; import io.ebeaninternal.api.SpiBackgroundExecutor; import io.ebeaninternal.api.SpiEbeanServer; @@ -15,10 +19,6 @@ import io.ebeaninternal.server.cluster.ClusterManager; import io.ebeaninternal.server.core.bootup.BootupClassPathSearch; import io.ebeaninternal.server.core.bootup.BootupClasses; import io.ebeaninternal.server.lib.ShutdownManager; -import io.ebean.datasource.DataSourceAlertFactory; -import io.ebean.datasource.DataSourceConfig; -import io.ebean.datasource.DataSourceFactory; -import io.ebean.datasource.DataSourcePoolListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -249,7 +249,7 @@ public class DefaultContainer implements SpiContainer { return null; } - DataSourceFactory factory = config.service(DataSourceFactory.class); + DataSourceFactory factory = DataSourceFactory.get(); if (factory == null) { throw new IllegalStateException("No DataSourceFactory service implementation found in class path." + " Probably missing dependency to avaje-datasource?");