From 602ad4e95363865b9ac63a3f5f0f77d631185997 Mon Sep 17 00:00:00 2001 From: Jose Alberto Hernandez Date: Sat, 20 Jul 2024 15:55:00 -0600 Subject: [PATCH] FINERACT-2109: Lib dependencies and versions between modules --- .gitignore | 8 ++--- build.gradle | 14 ++++---- .../org.apache.fineract.dependencies.gradle | 34 ++++++++++++------- fineract-doc/build.gradle | 4 +-- fineract-loan/dependencies.gradle | 2 +- fineract-provider/dependencies.gradle | 6 ++-- integration-tests/dependencies.gradle | 2 +- 7 files changed, 39 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index b63dd898e..5a6fc20cf 100644 --- a/.gitignore +++ b/.gitignore @@ -25,8 +25,8 @@ licenses **/.asciidoctor/images/* **/.asciidoctor/diagram/* **/images/diag-*.svg -fineract-avro-schemas/out/ -fineract-client/out/ + fineract-provider/src/main/generated/ -integration-tests/out/ -module/dummy/starter/out/ + +**/out/ +gradleExp/ diff --git a/build.gradle b/build.gradle index aae4ce7f7..ef47ad544 100644 --- a/build.gradle +++ b/build.gradle @@ -81,7 +81,7 @@ buildscript { classpath 'jakarta.ws.rs:jakarta.ws.rs-api:3.1.0' classpath 'com.google.cloud.tools:jib-layer-filter-extension-gradle:0.3.0' classpath 'org.apache.commons:commons-lang3:3.14.0' - classpath 'io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.19' + classpath 'io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.22' classpath 'jakarta.servlet:jakarta.servlet-api:6.0.0' } } @@ -102,8 +102,8 @@ plugins { id 'org.asciidoctor.jvm.convert' version '3.3.2' apply false id 'org.asciidoctor.jvm.pdf' version '3.3.2' apply false id 'org.asciidoctor.jvm.epub' version '3.3.2' apply false - id 'org.asciidoctor.jvm.revealjs' version '3.3.2' apply false - id 'org.asciidoctor.jvm.gems' version '3.3.2' apply false + // id 'org.asciidoctor.jvm.revealjs' version '3.3.2' apply false + // id 'org.asciidoctor.jvm.gems' version '3.3.2' apply false id 'org.asciidoctor.kindlegen.base' version '3.2.0' apply false id 'com.google.cloud.tools.jib' version '3.4.2' apply false id 'org.sonarqube' version '4.4.1.3373' @@ -712,10 +712,10 @@ configure(project.fineractCustomProjects) { 'com.google.truth.extensions:truth-java8-extension', 'io.github.classgraph:classgraph', 'io.cucumber:cucumber-core', - 'io.cucumber:cucumber-java', - 'io.cucumber:cucumber-java8', - 'io.cucumber:cucumber-junit-platform-engine', - 'io.cucumber:cucumber-spring', + 'io.cucumber:cucumber-java:7.16.1', + 'io.cucumber:cucumber-java8:7.16.1', + 'io.cucumber:cucumber-junit-platform-engine:7.16.1', + 'io.cucumber:cucumber-spring:7.16.1', ) testCompileOnly('org.projectlombok:lombok') diff --git a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle index 8412a89da..e3add49d5 100644 --- a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle +++ b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle @@ -29,11 +29,11 @@ dependencyManagement { mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.6' mavenBom 'io.awspring.cloud:spring-cloud-aws-dependencies:3.1.0' mavenBom 'io.opentelemetry:opentelemetry-bom:1.34.1' - mavenBom 'org.jetbrains.kotlin:kotlin-bom:1.9.22' + mavenBom 'org.jetbrains.kotlin:kotlin-bom:1.9.24' mavenBom 'org.junit:junit-bom:5.10.2' mavenBom 'com.fasterxml.jackson:jackson-bom:2.16.1' mavenBom 'io.cucumber:cucumber-bom:7.15.0' - mavenBom 'io.netty:netty-bom:4.1.106.Final' + mavenBom 'io.netty:netty-bom:4.1.110.Final' mavenBom 'org.mockito:mockito-bom:5.10.0' mavenBom 'software.amazon.awssdk:bom:2.23.18' mavenBom 'io.github.resilience4j:resilience4j-bom:2.2.0' @@ -44,8 +44,8 @@ dependencyManagement { // We do not use :+ to get the latest available version available on Maven Central, as that could suddenly break things. // We use the Renovate Bot to automatically propose Pull Requests (PRs) when upgrades for all of these versions are available. - dependency 'ch.qos.logback:logback-core:1.4.14' - dependency 'ch.qos.logback:logback-classic:1.4.14' + dependency 'ch.qos.logback:logback-core:1.5.3' + dependency 'ch.qos.logback:logback-classic:1.5.3' dependency 'ch.qos.logback.contrib:logback-json-classic:0.1.5' dependency 'ch.qos.logback.contrib:logback-jackson:0.1.5' dependency 'org.codehaus.janino:janino:3.1.11' @@ -57,6 +57,10 @@ dependencyManagement { dependency 'com.google.truth:truth:1.4.0' dependency 'com.google.truth.extensions:truth-java8-extension:1.4.0' dependency 'com.google.googlejavaformat:google-java-format:1.19.2' + dependency 'org.apache.commons:commons-collections4:4.4' + dependency ('software.amazon.msk:aws-msk-iam-auth:2.0.3') { + exclude 'commons-logging:commons-logging:' + } dependency ('org.apache.commons:commons-email:1.6.0') { exclude 'com.sun.mail:javax.mail' exclude 'javax.activation:activation' @@ -82,7 +86,6 @@ dependencyManagement { exclude 'org.apache.logging.log4j:log4j-api' exclude 'org.slf4j:slf4j-api' exclude 'commons-io:commons-io' - exclude 'commons-logging:commons-logging' exclude 'commons-codec:commons-codec' exclude 'org.apache.commons:commons-lang3' exclude 'org.apache.poi:poi' @@ -119,8 +122,8 @@ dependencyManagement { dependency 'org.apache.bval:org.apache.bval.bundle:3.0.0' dependency 'joda-time:joda-time:2.12.7' - dependency 'io.github.classgraph:classgraph:4.8.165' - dependency 'org.awaitility:awaitility:4.2.0' + dependency 'io.github.classgraph:classgraph:4.8.168' + dependency 'org.awaitility:awaitility:4.2.1' // TODO: upgrade to 4.8.3 dependency 'com.github.spotbugs:spotbugs-annotations:4.8.3' dependency 'javax.cache:cache-api:1.1.1' @@ -151,7 +154,7 @@ dependencyManagement { dependency "io.gsonfire:gson-fire:1.9.0" dependency "com.google.code.findbugs:jsr305:3.0.2" dependency "commons-codec:commons-codec:1.16.0" - dependency "org.projectlombok:lombok:1.18.30" + dependency "org.projectlombok:lombok:1.18.32" dependency 'org.bouncycastle:bcpkix-jdk15to18:1.77' dependency 'org.bouncycastle:bcprov-jdk15to18:1.77' @@ -175,11 +178,11 @@ dependencyManagement { exclude 'javax.annotation:javax.annotation-api' } - dependency 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.19' - dependency ('io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.19') { + dependency 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.22' + dependency ('io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.22') { exclude 'jakarta.activation:jakarta.activation-api' } - dependency ('io.swagger.core.v3:swagger-core-jakarta:2.2.19') { + dependency ('io.swagger.core.v3:swagger-core-jakarta:2.2.22') { exclude 'jakarta.activation:jakarta.activation-api' } @@ -206,7 +209,7 @@ dependencyManagement { } dependency 'org.owasp.esapi:esapi:2.5.3.1' - dependency 'org.awaitility:awaitility:4.2.0' + dependency 'org.awaitility:awaitility:4.2.1' dependencySet(group: 'org.apache.poi', version: '5.2.5') { entry 'poi' @@ -239,5 +242,12 @@ dependencyManagement { dependency 'org.apache.commons:commons-math3:3.6.1' dependency 'org.mockito:mockito-inline:5.2.0' + + dependency 'com.github.tomakehurst:wiremock-standalone:3.0.1' + + dependency 'io.cucumber:cucumber-java:7.16.1' + dependency 'io.cucumber:cucumber-java8:7.16.1' + dependency 'io.cucumber:cucumber-junit-platform-engine:7.16.1' + dependency 'io.cucumber:cucumber-spring:7.16.1' } } diff --git a/fineract-doc/build.gradle b/fineract-doc/build.gradle index 7f1c6bb67..2b0730b50 100644 --- a/fineract-doc/build.gradle +++ b/fineract-doc/build.gradle @@ -18,7 +18,7 @@ */ apply plugin: 'org.asciidoctor.jvm.convert' apply plugin: 'org.asciidoctor.jvm.pdf' -apply plugin: 'org.asciidoctor.jvm.revealjs' +// apply plugin: 'org.asciidoctor.jvm.revealjs' // apply plugin: 'org.asciidoctor.jvm.epub' // apply plugin: 'org.asciidoctor.kindlegen.base' @@ -40,7 +40,7 @@ asciidoctorj { pdf.version '1.6.2' diagram.version '2.2.1' epub.version '1.5.1' - revealjs.version '4.1.0' + // revealjs.version '4.1.0' } fatalWarnings ~/include file not found|missing callout|image to embed not found or not readable/ diff --git a/fineract-loan/dependencies.gradle b/fineract-loan/dependencies.gradle index f7c4f67ce..2122febb5 100644 --- a/fineract-loan/dependencies.gradle +++ b/fineract-loan/dependencies.gradle @@ -56,7 +56,7 @@ dependencies { 'io.github.resilience4j:resilience4j-spring-boot3', 'org.apache.httpcomponents:httpcore', - 'org.apache.commons:commons-collections4:4.4' + 'org.apache.commons:commons-collections4' ) compileOnly 'org.projectlombok:lombok' diff --git a/fineract-provider/dependencies.gradle b/fineract-provider/dependencies.gradle index 2d8dfd89c..67d6736e3 100644 --- a/fineract-provider/dependencies.gradle +++ b/fineract-provider/dependencies.gradle @@ -115,11 +115,9 @@ dependencies { 'io.github.resilience4j:resilience4j-spring-boot3', ) - implementation ('software.amazon.msk:aws-msk-iam-auth:2.0.3') { - exclude group: 'commons-logging' - } + implementation 'software.amazon.msk:aws-msk-iam-auth' - implementation 'io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.19' + implementation 'io.swagger.core.v3:swagger-jaxrs2-jakarta' implementation ('org.apache.commons:commons-email') { exclude group: 'com.sun.mail', module: 'javax.mail' diff --git a/integration-tests/dependencies.gradle b/integration-tests/dependencies.gradle index 23620799f..74f824630 100644 --- a/integration-tests/dependencies.gradle +++ b/integration-tests/dependencies.gradle @@ -58,5 +58,5 @@ dependencies { testImplementation 'org.mapstruct:mapstruct' testAnnotationProcessor 'org.mapstruct:mapstruct-processor' - testImplementation 'com.github.tomakehurst:wiremock-standalone:3.0.1' + testImplementation 'com.github.tomakehurst:wiremock-standalone' }