diff --git a/pom.xml b/pom.xml index 245743b1..75aed833 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ org.liquibase liquibase-core - 4.23.0 + 4.23.1 org.codehaus.groovy diff --git a/src/main/java/liquibase/ext/mongodb/database/MongoLiquibaseDatabase.java b/src/main/java/liquibase/ext/mongodb/database/MongoLiquibaseDatabase.java index 5b45e980..cf1e85fd 100644 --- a/src/main/java/liquibase/ext/mongodb/database/MongoLiquibaseDatabase.java +++ b/src/main/java/liquibase/ext/mongodb/database/MongoLiquibaseDatabase.java @@ -23,15 +23,12 @@ import com.mongodb.client.MongoDatabase; import liquibase.CatalogAndSchema; import liquibase.Scope; -import liquibase.changelog.ChangeLogHistoryService; import liquibase.changelog.ChangeLogHistoryServiceFactory; import liquibase.exception.LiquibaseException; import liquibase.executor.Executor; import liquibase.executor.ExecutorService; import liquibase.ext.mongodb.configuration.MongoConfiguration; import liquibase.ext.mongodb.statement.DropAllCollectionsStatement; -import liquibase.lockservice.LockService; -import liquibase.lockservice.LockServiceFactory; import liquibase.nosql.database.AbstractNoSqlDatabase; import lombok.NoArgsConstructor; import lombok.Setter; @@ -56,16 +53,6 @@ public void dropDatabaseObjects(final CatalogAndSchema schemaToDrop) throws Liqu final Executor executor = Scope.getCurrentScope().getSingleton(ExecutorService.class).getExecutor(EXECUTOR_NAME, this); DropAllCollectionsStatement dropAllCollectionsStatement = new DropAllCollectionsStatement(); executor.execute(dropAllCollectionsStatement); - - // TODO Revert this changes in the scope of DAT-15327 - LockService lockService = LockServiceFactory.getInstance().getLockService(this); - lockService.releaseLock(); - lockService.destroy(); - LockServiceFactory.getInstance().resetAll(); - ChangeLogHistoryService changeLogService = Scope.getCurrentScope().getSingleton(ChangeLogHistoryServiceFactory.class).getChangeLogService(this); - Scope.getCurrentScope().getSingleton(ChangeLogHistoryServiceFactory.class).unregister(changeLogService); - Scope.getCurrentScope().getSingleton(ChangeLogHistoryServiceFactory.class).resetAll(); - Scope.getCurrentScope().getSingleton(ExecutorService.class).reset(); Scope.getCurrentScope().getSingleton(ChangeLogHistoryServiceFactory.class).getChangeLogService(this).destroy(); }