#1517 - Update for ebean-datasource maven groupId change to io.ebean

pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>io.ebean</groupId>
   <artifactId>ebean</artifactId>
-  <version>11.23.2-SNAPSHOT</version>
+  <version>11.24.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>ebean</name>
@@ -121,9 +121,9 @@
     </dependency>
 
     <dependency>
-      <groupId>org.avaje</groupId>
-      <artifactId>avaje-datasource</artifactId>
-      <version>3.2.2</version>
+      <groupId>io.ebean</groupId>
+      <artifactId>ebean-datasource</artifactId>
+      <version>4.2.1</version>
     </dependency>
 
     <dependency>
@@ -270,7 +270,7 @@
       <version>5.1.43</version>
       <scope>test</scope>
     </dependency>
-    
+
     <dependency>
       <groupId>com.sap.cloud.db.jdbc</groupId>
       <artifactId>ngdbc</artifactId>

src/main/java/io/ebean/config/ServerConfig.java

@@ -30,7 +30,7 @@ import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.meta.MetaInfoManager;
 import io.ebean.migration.MigrationRunner;
 import io.ebean.util.StringHelper;
-import org.avaje.datasource.DataSourceConfig;
+import io.ebean.datasource.DataSourceConfig;
 
 import javax.sql.DataSource;
 import java.time.Clock;

src/main/java/io/ebeaninternal/server/core/DefaultContainer.java

@@ -15,10 +15,10 @@ 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 org.avaje.datasource.DataSourceAlertFactory;
-import org.avaje.datasource.DataSourceConfig;
-import org.avaje.datasource.DataSourceFactory;
-import org.avaje.datasource.DataSourcePoolListener;
+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;
 

src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java

@@ -87,7 +87,7 @@ import io.ebeanservice.docstore.api.DocStoreFactory;
 import io.ebeanservice.docstore.api.DocStoreIntegration;
 import io.ebeanservice.docstore.api.DocStoreUpdateProcessor;
 import io.ebeanservice.docstore.none.NoneDocStoreFactory;
-import org.avaje.datasource.DataSourcePool;
+import io.ebean.datasource.DataSourcePool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/io/ebeaninternal/server/core/MultiTenantDbCatalogSupplier.java

@@ -3,7 +3,7 @@ package io.ebeaninternal.server.core;
 import io.ebean.config.CurrentTenantProvider;
 import io.ebean.config.TenantCatalogProvider;
 import io.ebeaninternal.server.transaction.DataSourceSupplier;
-import org.avaje.datasource.DataSourcePool;
+import io.ebean.datasource.DataSourcePool;
 
 import javax.sql.DataSource;
 import java.io.PrintWriter;

src/main/java/io/ebeaninternal/server/core/MultiTenantDbSchemaSupplier.java

@@ -3,7 +3,7 @@ package io.ebeaninternal.server.core;
 import io.ebean.config.CurrentTenantProvider;
 import io.ebean.config.TenantSchemaProvider;
 import io.ebeaninternal.server.transaction.DataSourceSupplier;
-import org.avaje.datasource.DataSourcePool;
+import io.ebean.datasource.DataSourcePool;
 
 import javax.sql.DataSource;
 import java.io.PrintWriter;

src/main/java/io/ebeaninternal/server/core/SimpleDataSourceProvider.java

@@ -1,7 +1,7 @@
 package io.ebeaninternal.server.core;
 
 import io.ebeaninternal.server.transaction.DataSourceSupplier;
-import org.avaje.datasource.DataSourcePool;
+import io.ebean.datasource.DataSourcePool;
 
 import javax.sql.DataSource;
 import java.sql.Connection;

src/test/java/io/ebean/config/ServerConfigTest.java

@@ -2,7 +2,7 @@ package io.ebean.config;
 
 import io.ebean.annotation.PersistBatch;
 import io.ebean.config.dbplatform.IdType;
-import org.avaje.datasource.DataSourceConfig;
+import io.ebean.datasource.DataSourceConfig;
 import org.junit.Test;
 
 import java.util.Properties;

src/test/java/org/tests/basic/MainDbBoolean.java

@@ -9,7 +9,7 @@ import io.ebean.config.dbplatform.postgres.PostgresPlatform;
 import org.tests.model.basic.TOne;
 import org.tests.model.basic.TSDetail;
 import org.tests.model.basic.TSMaster;
-import org.avaje.datasource.DataSourceConfig;
+import io.ebean.datasource.DataSourceConfig;
 import org.junit.Assert;
 
 import java.util.List;

src/test/java/org/tests/basic/MyTestDataSourcePoolListener.java

@@ -1,6 +1,6 @@
 package org.tests.basic;
 
-import org.avaje.datasource.DataSourcePoolListener;
+import io.ebean.datasource.DataSourcePoolListener;
 
 import java.sql.Connection;
 

src/test/java/org/tests/query/TestQueryFindIterate.java

@@ -6,7 +6,7 @@ import io.ebean.EbeanServer;
 import io.ebean.Query;
 import io.ebean.QueryIterator;
 import io.ebean.plugin.SpiServer;
-import org.avaje.datasource.DataSourcePool;
+import io.ebean.datasource.DataSourcePool;
 import org.ebeantest.LoggedSqlCollector;
 import org.junit.Test;
 import org.tests.model.basic.Customer;

src/test/java/org/tests/transaction/TestAutoCommitDataSource.java

@@ -9,9 +9,9 @@ import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.properties.PropertiesLoader;
-import org.avaje.datasource.DataSourceConfig;
-import org.avaje.datasource.DataSourcePool;
-import org.avaje.datasource.pool.ConnectionPool;
+import io.ebean.datasource.DataSourceConfig;
+import io.ebean.datasource.DataSourcePool;
+import io.ebean.datasource.pool.ConnectionPool;
 import org.junit.Test;
 import org.tests.model.basic.UTDetail;
 import org.tests.model.basic.UTMaster;

src/test/java/org/tests/transaction/TestExplicitTransactionMode.java

@@ -9,9 +9,9 @@ import io.ebean.annotation.ForPlatform;
 import io.ebean.annotation.Platform;
 import io.ebean.config.ServerConfig;
 import io.ebean.config.properties.PropertiesLoader;
-import org.avaje.datasource.DataSourceConfig;
-import org.avaje.datasource.DataSourcePool;
-import org.avaje.datasource.pool.ConnectionPool;
+import io.ebean.datasource.DataSourceConfig;
+import io.ebean.datasource.DataSourcePool;
+import io.ebean.datasource.pool.ConnectionPool;
 import org.junit.Test;
 import org.tests.model.basic.UTDetail;
 import org.tests.model.basic.UTMaster;

src/test/java/org/tests/unitinternal/HelloMain.java

@@ -5,7 +5,7 @@ import io.ebean.EbeanServerFactory;
 import io.ebean.config.ServerConfig;
 import org.tests.model.basic.TOne;
 import org.avaje.agentloader.AgentLoader;
-import org.avaje.datasource.DataSourceConfig;
+import io.ebean.datasource.DataSourceConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;