This is an automated email from the ASF dual-hosted git repository. ptuomola pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git
commit 66e26beae1d02dec42d11e8b0576476729ffa111 Author: Michael Vorburger <[email protected]> AuthorDate: Sun Oct 4 16:30:50 2020 +0200 exclude awssdk:s3 from flyway-core dependency [FINERACT-1172] see https://github.com/apache/fineract/pull/1355 --- fineract-provider/build.gradle | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle index 183d8cf..d0ca266 100644 --- a/fineract-provider/build.gradle +++ b/fineract-provider/build.gradle @@ -106,7 +106,6 @@ dependencyManagement { dependency 'org.drizzle.jdbc:drizzle-jdbc:1.4' dependency 'com.github.librepdf:openpdf:1.3.22' dependency 'org.mnode.ical4j:ical4j:3.0.19' - dependency 'org.flywaydb:flyway-core:7.0.0' dependency 'org.quartz-scheduler:quartz:2.3.2' dependency 'com.amazonaws:aws-java-sdk-s3:1.11.874' dependency 'org.ehcache:ehcache:3.9.0' @@ -131,6 +130,14 @@ dependencyManagement { dependency 'org.webjars.npm:swagger-ui-dist:3.35.0' dependency 'org.webjars:webjars-locator-core:0.46' + dependency ('org.flywaydb:flyway-core:7.0.0') { + // https://issues.apache.org/jira/browse/FINERACT-1172 + // https://github.com/apache/fineract/pull/1355 + // https://github.com/flyway/flyway/issues/2957 + // exclude conflicting non-<optional> dependencies from https://github.com/flyway/flyway/blob/master/flyway-core/pom.xml + exclude 'software.amazon.awssdk:s3' + } + dependency ('org.dom4j:dom4j:2.1.3') { exclude 'relaxngDatatype:relaxngDatatype' // already in com.sun.xml.bind:jaxb-osgi:2.3.0.1 // FINERACT-940 && FINERACT-966 https://github.com/spotbugs/spotbugs/issues/1128
