diff --git a/build.gradle b/build.gradle index 36119fe66..cb937e813 100644 --- a/build.gradle +++ b/build.gradle @@ -72,9 +72,9 @@ buildscript { plugins { id 'me.qoomon.git-versioning' version '6.4.3' - id "org.barfuin.gradle.taskinfo" version "2.1.0" + id "org.barfuin.gradle.taskinfo" version "2.2.0" id 'com.adarshr.test-logger' version '4.0.0' - id 'com.diffplug.spotless' version '6.24.0' apply false + id 'com.diffplug.spotless' version '6.25.0' apply false id 'org.nosphere.apache.rat' version '0.8.1' apply false id 'com.github.hierynomus.license' version '0.16.1' apply false id 'com.github.jk1.dependency-license-report' version '2.5' apply false diff --git a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle index ef869eb95..687be3981 100644 --- a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle +++ b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle @@ -23,19 +23,19 @@ apply plugin: 'io.spring.dependency-management' dependencyManagement { imports { mavenBom 'com.squareup.okhttp3:okhttp-bom:4.12.0' - mavenBom 'org.slf4j:slf4j-bom:2.0.11' + mavenBom 'org.slf4j:slf4j-bom:2.0.12' mavenBom 'io.micrometer:micrometer-bom:1.12.2' mavenBom 'org.springframework:spring-framework-bom:6.1.3' mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.2' 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.junit:junit-bom:5.10.1' + 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 'org.mockito:mockito-bom:5.9.0' - mavenBom 'software.amazon.awssdk:bom:2.23.7' + 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' } @@ -54,8 +54,8 @@ dependencyManagement { dependency 'org.eclipse.persistence:org.eclipse.persistence.jpa:4.0.0' dependency 'com.google.guava:guava:32.0.0-jre' dependency 'com.google.code.gson:gson:2.10.1' - dependency 'com.google.truth:truth:1.3.0' - dependency 'com.google.truth.extensions:truth-java8-extension:1.3.0' + 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-email:1.6.0') { exclude 'com.sun.mail:javax.mail' @@ -119,7 +119,7 @@ dependencyManagement { dependency 'org.glassfish.jersey.media:jersey-media-multipart:3.1.5' dependency 'org.glassfish.jaxb:jaxb-runtime:2.3.6' // Swagger needs exactly this version dependency 'org.apache.bval:org.apache.bval.bundle:3.0.0' - dependency 'joda-time:joda-time:2.12.6' + dependency 'joda-time:joda-time:2.12.7' dependency 'io.github.classgraph:classgraph:4.8.165' dependency 'org.awaitility:awaitility:4.2.0' @@ -236,7 +236,7 @@ dependencyManagement { dependency 'org.postgresql:postgresql:42.7.1' - dependency 'org.assertj:assertj-core:3.25.1' + dependency 'org.assertj:assertj-core:3.25.3' dependency 'org.apache.commons:commons-math3:3.6.1' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135c4..d64cd4917 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index eed8d3ce1..a80b22ce5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip -networkTimeout=100000 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew.bat b/gradlew.bat index 6689b85be..7101f8e46 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/settings.gradle b/settings.gradle index 8bf195aa2..b9ee5672e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -18,7 +18,7 @@ */ plugins { - id 'com.gradle.enterprise' version '3.16.1' + id 'com.gradle.enterprise' version '3.16.2' id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.12.1' }