From 627ccf603fbaa2be52c34779d5aef016303c7ce4 Mon Sep 17 00:00:00 2001 From: Adam Saghy Date: Wed, 10 Sep 2025 21:06:24 +0200 Subject: [PATCH] FINERACT-2326: Upgrade dependencies --- build.gradle | 4 ++-- .../main/groovy/org.apache.fineract.dependencies.gradle | 7 ++++--- fineract-e2e-tests-core/build.gradle | 2 +- fineract-e2e-tests-runner/build.gradle | 2 +- .../fineract/portfolio/note/domain/NoteRepository.java | 3 +++ ...cationProcessWritePlatformServiceJpaRepositoryImpl.java | 4 +--- integration-tests/dependencies.gradle | 2 +- oauth2-tests/dependencies.gradle | 2 +- twofactor-tests/dependencies.gradle | 2 +- 9 files changed, 15 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 7c9f4f4e6..cf53f0d52 100644 --- a/build.gradle +++ b/build.gradle @@ -85,7 +85,7 @@ buildscript { classpath 'org.eclipse.persistence:eclipselink:4.0.6' 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.17.0' + classpath 'org.apache.commons:commons-lang3:3.18.0' classpath 'io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.22' classpath 'jakarta.servlet:jakarta.servlet-api:6.1.0' } @@ -100,7 +100,7 @@ plugins { id 'com.github.hierynomus.license' version '0.16.1' apply false id 'com.github.jk1.dependency-license-report' version '2.9' apply false id 'org.zeroturnaround.gradle.jrebel' version '1.2.0' apply false - id 'org.springframework.boot' version '3.4.4' apply false + id 'org.springframework.boot' version '3.5.5' apply false id 'net.ltgt.errorprone' version '4.1.0' apply false id 'io.swagger.core.v3.swagger-gradle-plugin' version '2.2.23' apply false id 'com.gorylenko.gradle-git-properties' version '2.4.2' 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 839330786..1e31bd4f7 100644 --- a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle +++ b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle @@ -25,8 +25,8 @@ dependencyManagement { mavenBom 'com.squareup.okhttp3:okhttp-bom:4.12.0' mavenBom 'org.slf4j:slf4j-bom:2.0.17' mavenBom 'io.micrometer:micrometer-bom:1.13.6' - mavenBom 'org.springframework:spring-framework-bom:6.2.5' - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.4.4' + mavenBom 'org.springframework:spring-framework-bom:6.2.10' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.5.5' mavenBom 'io.awspring.cloud:spring-cloud-aws-dependencies:3.2.1' mavenBom 'io.opentelemetry:opentelemetry-bom:1.44.1' mavenBom 'org.jetbrains.kotlin:kotlin-bom:2.0.21' @@ -210,7 +210,7 @@ dependencyManagement { exclude 'pull-parser:pull-parser' } - dependency 'org.owasp.esapi:esapi:2.6.0.0' + dependency 'org.owasp.esapi:esapi:2.7.0.0' dependency 'org.awaitility:awaitility:4.2.2' dependencySet(group: 'org.apache.poi', version: '5.4.1') { @@ -272,5 +272,6 @@ dependencyManagement { dependency 'com.ibm.icu:icu4j:76.1' dependency 'org.yakworks:spring-icu4j:0.4.2' + dependency 'org.apache.commons:commons-lang3:3.18.0' } } diff --git a/fineract-e2e-tests-core/build.gradle b/fineract-e2e-tests-core/build.gradle index 29d09e209..c67c82d52 100644 --- a/fineract-e2e-tests-core/build.gradle +++ b/fineract-e2e-tests-core/build.gradle @@ -68,7 +68,7 @@ dependencies { testImplementation 'com.squareup.retrofit2:retrofit:2.11.0' testImplementation 'org.apache.httpcomponents:httpclient:4.5.14' - testImplementation 'org.apache.commons:commons-lang3:3.17.0' + testImplementation 'org.apache.commons:commons-lang3:3.18.0' testImplementation ('com.googlecode.json-simple:json-simple:1.1.1') { exclude group: 'junit', module: 'junit' } diff --git a/fineract-e2e-tests-runner/build.gradle b/fineract-e2e-tests-runner/build.gradle index ccc64f51d..c3c4b94d4 100644 --- a/fineract-e2e-tests-runner/build.gradle +++ b/fineract-e2e-tests-runner/build.gradle @@ -40,7 +40,7 @@ dependencies { testImplementation 'com.squareup.retrofit2:retrofit:2.11.0' testImplementation 'org.apache.httpcomponents:httpclient:4.5.14' - testImplementation 'org.apache.commons:commons-lang3:3.17.0' + testImplementation 'org.apache.commons:commons-lang3:3.18.0' testImplementation ('com.googlecode.json-simple:json-simple:1.1.1') { exclude group: 'junit', module: 'junit' } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/domain/NoteRepository.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/domain/NoteRepository.java index c57b20e25..4fcf398a2 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/domain/NoteRepository.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/domain/NoteRepository.java @@ -26,6 +26,7 @@ import org.apache.fineract.portfolio.loanaccount.domain.LoanTransaction; import org.apache.fineract.portfolio.savings.domain.SavingsAccount; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -52,4 +53,6 @@ public interface NoteRepository extends JpaRepository, JpaSpecificat @Query("select note from Note note where note.savingsTransaction.id = :savingsTransactionId") List findBySavingsTransactionId(@Param("savingsTransactionId") Long savingsTransactionId); + @Modifying + void deleteAllBySavingsAccount(SavingsAccount savingsAccount); } diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.java index c7fb7d249..cfb24379e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.java @@ -400,9 +400,7 @@ public class SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl impl } } - final List relatedNotes = this.noteRepository.findBySavingsAccount(account); - this.noteRepository.deleteAllInBatch(relatedNotes); - + this.noteRepository.deleteAllBySavingsAccount(account); this.savingAccountRepository.delete(account); return new CommandProcessingResultBuilder() // diff --git a/integration-tests/dependencies.gradle b/integration-tests/dependencies.gradle index 3cb0686bf..66f45bb74 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:10.1.39@zip' + tomcat 'org.apache.tomcat:tomcat:10.1.42@zip' testImplementation( files("$rootDir/fineract-provider/build/classes/java/main/"), project(path: ':fineract-core', configuration: 'runtimeElements'), project(path: ':fineract-accounting', configuration: 'runtimeElements'), diff --git a/oauth2-tests/dependencies.gradle b/oauth2-tests/dependencies.gradle index a058c7089..67e7194d0 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:10.1.39@zip' + tomcat 'org.apache.tomcat:tomcat:10.1.42@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 0b594a1c1..f4685d8a1 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:10.1.39@zip' + tomcat 'org.apache.tomcat:tomcat:10.1.42@zip' testImplementation( files("$rootDir/fineract-provider/build/classes/java/main/"), project(path: ':fineract-provider', configuration: 'runtimeElements'), 'org.junit.jupiter:junit-jupiter-api',