diff --git a/drivers/mongock-driver-mongodb/mongodb-springdata-v3-driver/pom.xml b/drivers/mongock-driver-mongodb/mongodb-springdata-v3-driver/pom.xml index b81499569..aef7a858f 100644 --- a/drivers/mongock-driver-mongodb/mongodb-springdata-v3-driver/pom.xml +++ b/drivers/mongock-driver-mongodb/mongodb-springdata-v3-driver/pom.xml @@ -64,7 +64,7 @@ org.mongodb mongodb-driver-sync - 4.2.3 + ${spring-data-3.mongodb.version} provided diff --git a/drivers/mongock-driver-mongodb/pom.xml b/drivers/mongock-driver-mongodb/pom.xml index 85ce64712..d966748d2 100644 --- a/drivers/mongock-driver-mongodb/pom.xml +++ b/drivers/mongock-driver-mongodb/pom.xml @@ -30,7 +30,12 @@ [2.0.0, 3.0.0) 3.2.5 + 4.2.3 + + 2.2.13.RELEASE + 3.11.2 + [4.0.0, 5.0.0) [3.0.0, 4.0.0) diff --git a/mongock-core/mongock-runner/spring/springboot/mongock-springboot-base/pom.xml b/mongock-core/mongock-runner/spring/springboot/mongock-springboot-base/pom.xml index 6b501abb6..679b070b3 100644 --- a/mongock-core/mongock-runner/spring/springboot/mongock-springboot-base/pom.xml +++ b/mongock-core/mongock-runner/spring/springboot/mongock-springboot-base/pom.xml @@ -42,6 +42,10 @@ mongock-spring-base + + io.mongock + mongock-utils + diff --git a/mongock-core/mongock-runner/spring/springboot/mongock-springboot-base/src/main/java/io/mongock/runner/springboot/base/config/MongockContextBase.java b/mongock-core/mongock-runner/spring/springboot/mongock-springboot-base/src/main/java/io/mongock/runner/springboot/base/config/MongockContextBase.java index ee75d64fa..b2a13b97d 100644 --- a/mongock-core/mongock-runner/spring/springboot/mongock-springboot-base/src/main/java/io/mongock/runner/springboot/base/config/MongockContextBase.java +++ b/mongock-core/mongock-runner/spring/springboot/mongock-springboot-base/src/main/java/io/mongock/runner/springboot/base/config/MongockContextBase.java @@ -6,25 +6,29 @@ import io.mongock.runner.springboot.base.MongockApplicationRunner; import io.mongock.runner.springboot.base.MongockInitializingBeanRunner; import io.mongock.runner.springboot.base.builder.SpringApplicationBean; +import io.mongock.utils.Constants; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Bean; - +import org.springframework.context.annotation.Profile; public abstract class MongockContextBase { @Bean + @Profile("!" + Constants.CLI_PROFILE) @ConditionalOnExpression("'${mongock.runner-type:ApplicationRunner}'.toLowerCase().equals('applicationrunner')") public MongockApplicationRunner applicationRunner(ConnectionDriver connectionDriver, CONFIG springConfiguration, ApplicationContext springContext, ApplicationEventPublisher applicationEventPublisher) { + return getBuilder(connectionDriver, springConfiguration, springContext, applicationEventPublisher) .buildApplicationRunner(); } @Bean + @Profile("!" + Constants.CLI_PROFILE) @ConditionalOnExpression("'${mongock.runner-type:null}'.toLowerCase().equals('initializingbean')") public MongockInitializingBeanRunner initializingBeanRunner(ConnectionDriver connectionDriver, CONFIG springConfiguration,