merged 4.0beta into main

pom.xml

@@ -3,7 +3,7 @@
 
 	<groupId>org.liquibase.ext</groupId>
 	<artifactId>liquibase-sqlfire</artifactId>
-	<version>3.10.2-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
     <name>Liquibase SqlFire Database Extension</name>
@@ -74,7 +74,7 @@
 		<dependency>
 			<groupId>org.liquibase</groupId>
 			<artifactId>liquibase-core</artifactId>
-			<version>3.10.1</version>
+			<version>4.0.0</version>
 		</dependency>
 	</dependencies>
 

src/main/java/liquibase/ext/sqlfire/database/SQLFireDatabase.java

@@ -6,6 +6,7 @@
 import java.util.Enumeration;
 
 import liquibase.CatalogAndSchema;
+import liquibase.Scope;
 import liquibase.database.AbstractJdbcDatabase;
 import liquibase.database.Database;
 import liquibase.database.DatabaseConnection;
@@ -119,9 +120,9 @@ public String getViewDefinition(CatalogAndSchema schema, String name) throws Dat
     @Override
     protected String getConnectionCatalogName() throws DatabaseException {
         try {
-            return ExecutorService.getInstance().getExecutor(this).queryForObject(new RawSqlStatement("select current schema from sysibm.sysdummy1"), String.class);
+            return Scope.getCurrentScope().getSingleton(ExecutorService.class).getExecutor("jdbc", this).queryForObject(new RawSqlStatement("select current schema from sysibm.sysdummy1"), String.class);
         } catch (Exception e) {
-            LogFactory.getLogger().info("Error getting default schema", e);
+            Scope.getCurrentScope().getLog(getClass()).info("Error getting default schema", e);
         }
         return null;
     }

src/main/resources/META-INF/services/liquibase.database.Database

@@ -0,0 +1 @@
+liquibase.ext.sqlfire.database.SQLFireDatabase

src/main/resources/META-INF/services/liquibase.datatype.LiquibaseDataType

@@ -0,0 +1,2 @@
+liquibase.ext.sqlfire.datatype.SqlFireBooleanType
+liquibase.ext.sqlfire.datatype.SqlFireDateTimeType

src/main/resources/META-INF/services/liquibase.sqlgenerator.SqlGenerator

@@ -0,0 +1,2 @@
+liquibase.ext.sqlfire.sqlgenerator.CreateDatabaseChangeLogLockTableGeneratorSqlFire
+liquibase.ext.sqlfire.sqlgenerator.CreateDatabaseChangeLogTableGeneratorSqlFire