From b2472b7e115635e354a92c3e26ea1ca84b164c01 Mon Sep 17 00:00:00 2001 From: Kristof Jozsa Date: Wed, 27 Nov 2024 21:46:36 +0100 Subject: [PATCH] fix liquibase --- fineract-provider/build.gradle | 18 ++++++++++++++++++ .../conditions/LoanCOBEnabledCondition.java | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle index d8a73b925a9..8de6b4a4cc8 100644 --- a/fineract-provider/build.gradle +++ b/fineract-provider/build.gradle @@ -123,8 +123,26 @@ bootRun { ] } +task copyDependencyResources(type: Copy) { + dependsOn configurations.runtimeClasspath + dependsOn ':fineract-core:jar' + dependsOn ':fineract-loan:jar' + dependsOn ':fineract-tax:jar' + dependsOn ':fineract-rates:jar' + dependsOn ':fineract-document:jar' + dependsOn ':fineract-report:jar' + + from { + configurations.runtimeClasspath.collect { zipTree(it) } + } + include '**/db/changelog/**/*' + into "${buildDir}/resources/main" +} + +classes.dependsOn copyDependencyResources bootJar { + dependsOn copyDependencyResources duplicatesStrategy = DuplicatesStrategy.EXCLUDE manifest { attributes( diff --git a/fineract-provider/src/main/java/org/apache/fineract/cob/conditions/LoanCOBEnabledCondition.java b/fineract-provider/src/main/java/org/apache/fineract/cob/conditions/LoanCOBEnabledCondition.java index 205a301d8f4..02b1a1323b6 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/cob/conditions/LoanCOBEnabledCondition.java +++ b/fineract-provider/src/main/java/org/apache/fineract/cob/conditions/LoanCOBEnabledCondition.java @@ -25,6 +25,6 @@ public class LoanCOBEnabledCondition extends PropertiesCondition { @Override protected boolean matches(FineractProperties properties) { - return properties.getJob().isLoanCobEnabled(); + return properties.getJob() != null && properties.getJob().isLoanCobEnabled(); } }