diff --git a/build.gradle b/build.gradle index c654d88df..bac9000e2 100644 --- a/build.gradle +++ b/build.gradle @@ -58,15 +58,15 @@ buildscript { plugins { id "org.barfuin.gradle.taskinfo" version "1.4.0" id 'com.adarshr.test-logger' version '3.2.0' - id 'com.diffplug.spotless' version '6.5.2' apply false + id 'com.diffplug.spotless' version '6.8.0' apply false id 'org.nosphere.apache.rat' version '0.7.1' apply false id 'com.github.hierynomus.license' version '0.16.1' apply false id 'com.github.jk1.dependency-license-report' version '2.1' apply false - id 'org.openapi.generator' version '6.0.0' apply false + id 'org.openapi.generator' version '6.0.1' apply false id 'org.zeroturnaround.gradle.jrebel' version '1.1.11' apply false - id 'org.springframework.boot' version '2.6.7' apply false + id 'org.springframework.boot' version '2.7.1' apply false id 'net.ltgt.errorprone' version '2.0.2' apply false - id 'io.swagger.core.v3.swagger-gradle-plugin' version '2.2.0' apply false + id 'io.swagger.core.v3.swagger-gradle-plugin' version '2.2.1' apply false id 'com.gorylenko.gradle-git-properties' version '2.4.1' apply false id 'org.asciidoctor.jvm.convert' version '3.3.2' apply false id 'org.asciidoctor.jvm.pdf' version '3.3.2' apply false @@ -76,9 +76,9 @@ plugins { id 'org.asciidoctor.kindlegen.base' version '3.2.0' apply false id 'com.google.cloud.tools.jib' version '3.2.1' apply false id 'fr.brouillard.oss.gradle.jgitver' version '0.10.0-rc03' - id 'org.sonarqube' version '3.3' + id 'org.sonarqube' version '3.4.0.2513' id 'com.github.andygoossens.modernizer' version '1.6.2' apply false - id 'com.github.spotbugs' version '5.0.6' apply false + id 'com.github.spotbugs' version '5.0.9' apply false id 'se.thinkcode.cucumber-runner' version '0.0.11' apply false } @@ -375,7 +375,7 @@ configure(project.fineractJavaProjects) { // Configuration for the Checkstyle plugin // https://docs.gradle.org/current/userguide/checkstyle_plugin.html dependencies { - checkstyle 'com.puppycrawl.tools:checkstyle:10.2' + checkstyle 'com.puppycrawl.tools:checkstyle:10.3.1' checkstyle 'com.github.sevntu-checkstyle:sevntu-checks:1.42.0' } @@ -397,7 +397,7 @@ configure(project.fineractJavaProjects) { // Configuration for the errorprone plugin // https://github.com/tbroyer/gradle-errorprone-plugin dependencies { - errorprone "com.google.errorprone:error_prone_core:2.13.1" + errorprone "com.google.errorprone:error_prone_core:2.14.0" } tasks.withType(JavaCompile) { diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 4a4b13b80..538034a29 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -17,7 +17,7 @@ * under the License. */ plugins { - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'io.spring.dependency-management' version '1.0.12.RELEASE' id 'groovy' id 'java-gradle-plugin' id 'groovy-gradle-plugin' diff --git a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle index 02cc5347f..cb02a4654 100644 --- a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle +++ b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle @@ -22,14 +22,14 @@ apply plugin: 'io.spring.dependency-management' // https://github.com/spring-gradle-plugins/dependency-management-plugin dependencyManagement { imports { - mavenBom 'org.springframework:spring-framework-bom:5.3.19' - mavenBom 'org.springframework.boot:spring-boot-dependencies:2.6.7' - mavenBom 'org.jetbrains.kotlin:kotlin-bom:1.6.21' + mavenBom 'org.springframework:spring-framework-bom:5.3.21' + mavenBom 'org.springframework.boot:spring-boot-dependencies:2.7.1' + mavenBom 'org.jetbrains.kotlin:kotlin-bom:1.7.0' mavenBom 'org.junit:junit-bom:5.8.2' - mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.2.1' - mavenBom 'io.cucumber:cucumber-bom:7.3.4' - mavenBom 'io.netty:netty-bom:4.1.76.Final' - mavenBom 'org.mockito:mockito-bom:4.5.1' + mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.3' + mavenBom 'io.cucumber:cucumber-bom:7.4.1' + mavenBom 'io.netty:netty-bom:4.1.78.Final' + mavenBom 'org.mockito:mockito-bom:4.6.1' } dependencies { @@ -56,31 +56,31 @@ dependencyManagement { exclude 'javax.activation:activation' } dependency 'commons-io:commons-io:2.11.0' - dependency 'com.github.librepdf:openpdf:1.3.27' - dependency ('org.mnode.ical4j:ical4j:3.2.2') { + dependency 'com.github.librepdf:openpdf:1.3.28' + dependency ('org.mnode.ical4j:ical4j:3.2.3') { exclude 'com.sun.mail:javax.mail' } dependency 'org.quartz-scheduler:quartz:2.3.2' - dependency 'com.amazonaws:aws-java-sdk-s3:1.12.213' + dependency 'com.amazonaws:aws-java-sdk-s3:1.12.253' dependency 'org.ehcache:ehcache:3.10.0' dependency 'com.github.spullara.mustache.java:compiler:0.9.10' dependency 'com.jayway.jsonpath:json-path:2.7.0' - dependency 'org.apache.tika:tika-core:2.4.0' + dependency 'org.apache.tika:tika-core:2.4.1' dependency 'org.apache.httpcomponents:httpclient:4.5.13' dependency 'jakarta.management.j2ee:jakarta.management.j2ee-api:1.1.4' dependency 'jakarta.jms:jakarta.jms-api:2.0.3' dependency 'org.glassfish.jaxb:jaxb-runtime:2.3.6' // Swagger needs exactly this version - dependency 'org.apache.bval:org.apache.bval.bundle:2.0.5' + dependency 'org.apache.bval:org.apache.bval.bundle:2.0.6' dependency 'joda-time:joda-time:2.10.14' - dependency 'io.github.classgraph:classgraph:4.8.146' + dependency 'io.github.classgraph:classgraph:4.8.147' dependency 'org.awaitility:awaitility:4.2.0' - dependency 'com.github.spotbugs:spotbugs-annotations:4.7.0' + dependency 'com.github.spotbugs:spotbugs-annotations:4.7.1' dependency 'javax.cache:cache-api:1.1.1' dependency 'org.mock-server:mockserver-junit-jupiter:5.13.2' - dependency 'org.webjars:webjars-locator-core:0.50' + dependency 'org.webjars:webjars-locator-core:0.52' dependency 'com.icegreen:greenmail-junit5:1.6.9' - dependency 'com.intuit.karate:karate-junit5:1.2.0.RC6' + dependency 'com.intuit.karate:karate-junit5:1.2.0' // fineract client dependencies dependency "com.squareup.retrofit2:retrofit:2.9.0" @@ -100,13 +100,13 @@ dependencyManagement { dependency "org.apache.oltu.oauth2:org.apache.oltu.oauth2.common:1.0.1" dependency "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:1.0.1" dependency "org.apache.oltu.oauth2:org.apache.oltu.oauth2.httpclient4:1.0.1" - dependency "com.squareup.okhttp3:okhttp:4.9.3" - dependency "com.squareup.okhttp3:okcurl:4.9.3" - dependency "com.squareup.okhttp3:logging-interceptor:4.9.3" + dependency "com.squareup.okhttp3:okhttp:4.10.0" + dependency "com.squareup.okhttp3:okcurl:4.10.0" + dependency "com.squareup.okhttp3:logging-interceptor:4.10.0" dependency "com.squareup.okhttp3:okhttp-apache:4.9.3" dependency "com.squareup.okhttp3:okhttp-android-support:4.9.3" - dependency "com.squareup.okhttp3:okhttp-urlconnection:4.9.3" - dependency "com.squareup.okhttp3:okhttp-sse:4.9.3" + dependency "com.squareup.okhttp3:okhttp-urlconnection:4.10.0" + dependency "com.squareup.okhttp3:okhttp-sse:4.10.0" dependency "io.gsonfire:gson-fire:1.8.5" dependency "com.google.code.findbugs:jsr305:3.0.2" dependency "commons-codec:commons-codec:1.15" @@ -117,31 +117,31 @@ dependencyManagement { dependency 'org.bouncycastle:bcprov-jdk15on:1.70' dependency 'org.bouncycastle:bcpg-jdk15on:1.70' - dependency 'org.eclipse.jgit:org.eclipse.jgit:6.1.0.202203080745-r' - dependency 'org.eclipse.jgit:org.eclipse.jgit.ssh.apache:6.1.0.202203080745-r' + dependency 'org.eclipse.jgit:org.eclipse.jgit:6.2.0.202206071550-r' + dependency 'org.eclipse.jgit:org.eclipse.jgit.ssh.apache:6.2.0.202206071550-r' - dependency 'org.tmatesoft.svnkit:svnkit:1.10.5' + dependency 'org.tmatesoft.svnkit:svnkit:1.10.7' dependency 'com.vdurmont:semver4j:3.1.0' dependency 'org.beryx:text-io:3.4.1' - dependency 'org.springdoc:springdoc-openapi-ui:1.6.8' - dependency 'org.springdoc:springdoc-openapi-webmvc-core:1.6.8' - dependency 'org.springdoc:springdoc-openapi-common:1.6.8' - dependency 'org.springdoc:springdoc-openapi-security:1.6.8' - dependency 'org.springdoc:springdoc-openapi-javadoc:1.6.8' + dependency 'org.springdoc:springdoc-openapi-ui:1.6.9' + dependency 'org.springdoc:springdoc-openapi-webmvc-core:1.6.9' + dependency 'org.springdoc:springdoc-openapi-common:1.6.9' + dependency 'org.springdoc:springdoc-openapi-security:1.6.9' + dependency 'org.springdoc:springdoc-openapi-javadoc:1.6.9' - dependency 'com.google.cloud.sql:mysql-socket-factory-connector-j-8:1.6.0' + dependency 'com.google.cloud.sql:mysql-socket-factory-connector-j-8:1.6.1' dependency ('org.apache.activemq:activemq-broker:5.17.1') { exclude 'javax.annotation:javax.annotation-api' } dependency 'io.swagger:swagger-annotations:1.6.6' - dependency 'io.swagger.core.v3:swagger-annotations:2.2.0' - dependency ('io.swagger.core.v3:swagger-jaxrs2:2.2.0') { + dependency 'io.swagger.core.v3:swagger-annotations:2.2.1' + dependency ('io.swagger.core.v3:swagger-jaxrs2:2.2.1') { exclude 'jakarta.activation:jakarta.activation-api' } - dependency ('io.swagger.core.v3:swagger-core:2.2.0') { + dependency ('io.swagger.core.v3:swagger-core:2.2.1') { exclude 'jakarta.activation:jakarta.activation-api' } @@ -155,7 +155,7 @@ dependencyManagement { exclude 'jakarta.activation:jakarta.activation-api' } - dependency ('org.liquibase:liquibase-core:4.10.0') { + dependency ('org.liquibase:liquibase-core:4.12.0') { exclude 'javax.xml.bind:jaxb-api' } @@ -181,7 +181,7 @@ dependencyManagement { entry 'xml-path' } - dependency 'org.mapstruct:mapstruct:1.5.1.Final' - dependency 'org.mapstruct:mapstruct-processor:1.5.1.Final' + dependency 'org.mapstruct:mapstruct:1.5.2.Final' + dependency 'org.mapstruct:mapstruct-processor:1.5.2.Final' } } diff --git a/docker-compose-postgresql.yml b/docker-compose-postgresql.yml index 2d8e15965..f5da1f263 100644 --- a/docker-compose-postgresql.yml +++ b/docker-compose-postgresql.yml @@ -22,7 +22,7 @@ version: '3.7' services: # Backend service fineractpostgresql: - image: postgres:14.2 + image: postgres:14.4 volumes: - ./fineract-db/docker/postgresql:/docker-entrypoint-initdb.d/:Z,ro restart: always diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle index 3104bd5d9..edafbab2d 100644 --- a/fineract-provider/build.gradle +++ b/fineract-provider/build.gradle @@ -149,8 +149,8 @@ configurations { driver } dependencies { - driver 'org.mariadb.jdbc:mariadb-java-client:2.7.5' - driver 'org.postgresql:postgresql:42.3.5' + driver 'org.mariadb.jdbc:mariadb-java-client:2.7.6' + driver 'org.postgresql:postgresql:42.4.0' driver 'mysql:mysql-connector-java:8.0.29' } @@ -221,8 +221,8 @@ bootRun { ] dependencies { - implementation 'org.mariadb.jdbc:mariadb-java-client:2.7.5' - implementation 'org.postgresql:postgresql:42.3.5' + implementation 'org.mariadb.jdbc:mariadb-java-client:2.7.6' + implementation 'org.postgresql:postgresql:42.4.0' } } @@ -285,8 +285,8 @@ jib { allowInsecureRegistries = true dependencies { - implementation 'org.mariadb.jdbc:mariadb-java-client:2.7.5' - implementation 'org.postgresql:postgresql:42.3.5' + implementation 'org.mariadb.jdbc:mariadb-java-client:2.7.6' + implementation 'org.postgresql:postgresql:42.4.0' } pluginExtensions { diff --git a/fineract-provider/dependencies.gradle b/fineract-provider/dependencies.gradle index ffaa5baa3..6fd092674 100644 --- a/fineract-provider/dependencies.gradle +++ b/fineract-provider/dependencies.gradle @@ -33,7 +33,7 @@ dependencies { 'org.springframework.boot:spring-boot-starter-oauth2-resource-server', 'org.springframework.boot:spring-boot-starter-actuator', - 'org.glassfish.jersey.media:jersey-media-multipart:2.35', + 'org.glassfish.jersey.media:jersey-media-multipart:2.36', 'org.springframework:spring-jms', 'org.springframework:spring-context-support', diff --git a/instancemode-tests/dependencies.gradle b/instancemode-tests/dependencies.gradle index d1852c0e7..c07274e03 100644 --- a/instancemode-tests/dependencies.gradle +++ b/instancemode-tests/dependencies.gradle @@ -20,7 +20,7 @@ dependencies { // testCompile dependencies are ONLY used in src/test, not src/main. // Do NOT repeat dependencies which are ALREADY in implementation or runtimeOnly! // - tomcat 'org.apache.tomcat:tomcat:9.0.62@zip' + tomcat 'org.apache.tomcat:tomcat:9.0.64@zip' testImplementation( files("$rootDir/fineract-provider/build/classes/java/main/"), project(path: ':fineract-provider', configuration: 'runtimeElements'), 'io.cucumber:cucumber-spring', diff --git a/integration-tests/dependencies.gradle b/integration-tests/dependencies.gradle index 8067dae52..5df589539 100644 --- a/integration-tests/dependencies.gradle +++ b/integration-tests/dependencies.gradle @@ -20,7 +20,7 @@ dependencies { // testCompile dependencies are ONLY used in src/test, not src/main. // Do NOT repeat dependencies which are ALREADY in implementation or runtimeOnly! // - tomcat 'org.apache.tomcat:tomcat:9.0.62@zip' + tomcat 'org.apache.tomcat:tomcat:9.0.64@zip' testImplementation( files("$rootDir/fineract-provider/build/classes/java/main/"), project(path: ':fineract-provider', configuration: 'runtimeElements'), project(path: ':fineract-client', configuration: 'runtimeElements'), diff --git a/oauth2-tests/dependencies.gradle b/oauth2-tests/dependencies.gradle index dd6594331..908601f8d 100644 --- a/oauth2-tests/dependencies.gradle +++ b/oauth2-tests/dependencies.gradle @@ -20,7 +20,7 @@ dependencies { // testCompile dependencies are ONLY used in src/test, not src/main. // Do NOT repeat dependencies which are ALREADY in implementation or runtimeOnly! // - tomcat 'org.apache.tomcat:tomcat:9.0.62@zip' + tomcat 'org.apache.tomcat:tomcat:9.0.64@zip' testImplementation( files("$rootDir/fineract-provider/build/classes/java/main/"), project(path: ':fineract-provider', configuration: 'runtimeElements'), 'org.junit.jupiter:junit-jupiter-api', diff --git a/twofactor-tests/dependencies.gradle b/twofactor-tests/dependencies.gradle index 790ffc575..d67cb0c2e 100644 --- a/twofactor-tests/dependencies.gradle +++ b/twofactor-tests/dependencies.gradle @@ -20,7 +20,7 @@ dependencies { // testCompile dependencies are ONLY used in src/test, not src/main. // Do NOT repeat dependencies which are ALREADY in implementation or runtimeOnly! // - tomcat 'org.apache.tomcat:tomcat:9.0.62@zip' + tomcat 'org.apache.tomcat:tomcat:9.0.64@zip' testImplementation( files("$rootDir/fineract-provider/build/classes/java/main/"), project(path: ':fineract-provider', configuration: 'runtimeElements'), 'org.junit.jupiter:junit-jupiter-api',