FINERACT-2621: Upgrade dependencies to Spring Boot 4.1

build.gradle

@@ -97,9 +97,18 @@ buildscript {
         maven { url 'https://plugins.gradle.org/m2/' }
     }
 
+    configurations.classpath {
+        resolutionStrategy {
+            // The Spring Boot 4 Gradle plugin pulls spring-core 7.x onto the shared buildscript
+            // classpath, but the hierynomus license plugin's transitive license-maven-plugin:3.0
+            // needs a PropertyPlaceholderHelper constructor that Spring Framework 7 removed.
+            force 'org.springframework:spring-core:6.2.18'
+        }
+    }
+
     dependencies {
         classpath 'com.bmuschko:gradle-cargo-plugin:2.9.0'
-        classpath 'org.eclipse.persistence:eclipselink:4.0.9'
+        classpath 'org.eclipse.persistence:eclipselink:5.0.1'
         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.20.0'
@@ -117,7 +126,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.2' apply false
-    id 'org.springframework.boot' version '3.5.15' apply false
+    id 'org.springframework.boot' version '4.1.0' apply false
     id 'net.ltgt.errorprone' version '4.4.0' apply false
     id 'io.swagger.core.v3.swagger-gradle-plugin' version '2.2.49' apply false
     id 'com.gorylenko.gradle-git-properties' version '2.5.7' apply false
@@ -418,6 +427,11 @@ configure(project.fineractJavaProjects) {
         options.incremental = true
         options.fork = true
         outputs.cacheIf { true }
+        // Lombok reads lombok.config at compile time; without this input, cached or
+        // incremental builds can reuse classes generated under an older config
+        inputs.file(rootProject.file('lombok.config'))
+                .withPropertyName('lombokConfig')
+                .withPathSensitivity(PathSensitivity.NONE)
         options.compilerArgs << '-parameters'
         options.encoding = 'UTF-8'
         options.compilerArgs << '-Xlint:unchecked'
@@ -704,6 +718,9 @@ configure(project.fineractJavaProjects) {
                 'org.slf4j:slf4j-api',
                 'org.slf4j:log4j-over-slf4j',
                 'org.slf4j:jul-to-slf4j',
+                // Spring Framework 7 removed spring-jcl (which provided org.apache.commons.logging);
+                // commons-logging itself is excluded globally, so bridge JCL to SLF4J everywhere
+                'org.slf4j:jcl-over-slf4j',
                 )
         implementation ("ch.qos.logback:logback-classic") {
             exclude(module: "slf4j-api")
@@ -829,7 +846,6 @@ configure(project.fineractCustomProjects) {
             exclude group: 'org.skyscreamer'
         }
         testImplementation( 'org.mockito:mockito-core',
-                'org.mockito:mockito-inline',
                 'org.mockito:mockito-junit-jupiter',
                 'org.junit.jupiter:junit-jupiter-api',
                 'org.junit.jupiter:junit-jupiter-engine',

buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle

@@ -25,18 +25,18 @@ dependencyManagement {
         mavenBom 'com.squareup.okhttp3:okhttp-bom:4.12.0'
         mavenBom 'org.slf4j:slf4j-bom:2.0.17'
         mavenBom 'io.micrometer:micrometer-bom:1.16.5'
-        mavenBom 'org.springframework.boot:spring-boot-dependencies:3.5.15'
+        mavenBom 'org.springframework.boot:spring-boot-dependencies:4.1.0'
         mavenBom 'io.awspring.cloud:spring-cloud-aws-dependencies:4.0.2'
         mavenBom 'io.opentelemetry:opentelemetry-bom:1.62.0'
         mavenBom 'org.jetbrains.kotlin:kotlin-bom:2.3.21'
-        mavenBom 'org.junit:junit-bom:5.14.4'
+        mavenBom 'org.junit:junit-bom:6.0.3'
         mavenBom 'com.fasterxml.jackson:jackson-bom:2.22.1'
         mavenBom 'io.cucumber:cucumber-bom:7.34.3'
         mavenBom 'org.mockito:mockito-bom:5.23.0'
         mavenBom 'software.amazon.awssdk:bom:2.44.4'
         mavenBom 'io.github.resilience4j:resilience4j-bom:2.4.0'
         mavenBom 'org.testcontainers:testcontainers-bom:1.21.4'
-        mavenBom 'org.glassfish.jersey:jersey-bom:3.1.11'
+        mavenBom 'org.glassfish.jersey:jersey-bom:4.0.2'
     }
 
     dependencies {
@@ -50,7 +50,7 @@ dependencyManagement {
         dependency 'ch.qos.logback.contrib:logback-jackson:0.1.5'
         dependency 'org.codehaus.janino:janino:3.1.12'
 
-        dependency 'org.eclipse.persistence:org.eclipse.persistence.jpa:4.0.9'
+        dependency 'org.eclipse.persistence:org.eclipse.persistence.jpa:5.0.1'
         dependency 'com.google.guava:guava:33.6.0-jre'
         dependency 'com.google.code.gson:gson:2.14.0'
         dependency 'com.google.googlejavaformat:google-java-format:1.35.0'
@@ -184,7 +184,7 @@ dependencyManagement {
         dependency 'com.vdurmont:semver4j:3.1.0'
         dependency 'org.beryx:text-io:3.4.1'
 
-        dependency ('org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.17') {
+        dependency ('org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.3') {
             exclude 'io.swagger.core.v3:swagger-core'
         }
 
@@ -259,7 +259,6 @@ dependencyManagement {
         dependency 'org.apache.commons:commons-math3:3.6.1'
         dependency 'commons-beanutils:commons-beanutils:1.11.0'
 
-        dependency 'org.mockito:mockito-inline:5.2.0'
 
         dependency 'org.wiremock:wiremock-standalone:3.13.2'
         dependency 'org.apache.sshd:sshd-common:2.17.1'
@@ -275,10 +274,7 @@ dependencyManagement {
         dependency 'org.openjdk.jmh:jmh-core:1.37'
         dependency 'org.openjdk.jmh:jmh-generator-annprocess:1.37'
 
-        dependency 'org.springframework.restdocs:spring-restdocs-asciidoctor:3.0.5'
-        dependency 'org.springframework.restdocs:spring-restdocs-mockmvc:3.0.5'
-        dependency 'org.springframework.restdocs:spring-restdocs-webtestclient:3.0.5'
-        dependency 'org.springframework.restdocs:spring-restdocs-restassured:3.0.5'
+        // spring-restdocs (4.0.x) now managed by the Spring Boot 4 BOM
 
         dependency 'com.lmax:disruptor:4.0.0'
 
@@ -292,8 +288,9 @@ dependencyManagement {
         dependency 'org.yakworks:spring-icu4j:0.5.2'
         dependency 'org.apache.commons:commons-lang3:3.20.0'
         dependency 'com.nimbusds:nimbus-jose-jwt:10.9'
-        dependency 'org.springframework:spring-core:6.2.18'
-        dependency 'org.springframework.security:spring-security-core:6.5.10'
+        // spring-core & spring-security-core now come from the Spring Boot 4 BOM (Spring Framework 7 / Security 7)
+        // resilience4j-bom does not manage the spring-boot4 starter variant — pin it explicitly:
+        dependency 'io.github.resilience4j:resilience4j-spring-boot4:2.4.0'
         // Keep Netty on the 4.1 line for MockServer compatibility.
         dependency 'io.netty:netty-buffer:4.1.135.Final'
         dependency 'io.netty:netty-common:4.1.135.Final'
@@ -312,10 +309,6 @@ dependencyManagement {
         dependency 'io.netty:netty-transport-classes-epoll:4.1.135.Final'
         dependency 'io.netty:netty-transport-native-unix-common:4.1.135.Final'
         dependency 'at.yawk.lz4:lz4-java:1.11.0'
-        dependency 'org.thymeleaf:thymeleaf:3.1.5.RELEASE'
-        dependency 'org.thymeleaf:thymeleaf-spring6:3.1.5.RELEASE'
-        dependency 'org.apache.tomcat.embed:tomcat-embed-core:10.1.55'
-        dependency 'org.apache.tomcat.embed:tomcat-embed-el:10.1.55'
-        dependency 'org.apache.tomcat.embed:tomcat-embed-websocket:10.1.55'
+        // thymeleaf + thymeleaf-spring7 and Tomcat 11 embed now come from the Spring Boot 4 BOM
     }
 }

custom/acme/loan/job/src/main/java/com/acme/fineract/loan/job/AcmeNoopJobConfiguration.java

@@ -19,11 +19,11 @@
 package com.acme.fineract.loan.job;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.job.builder.JobBuilder;
-import org.springframework.batch.core.launch.support.RunIdIncrementer;
+import org.springframework.batch.core.job.parameters.RunIdIncrementer;
 import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.Step;
 import org.springframework.batch.core.step.builder.StepBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

custom/acme/loan/job/src/main/java/com/acme/fineract/loan/job/AcmeNoopJobTasklet.java

@@ -19,10 +19,10 @@
 package com.acme.fineract.loan.job;
 
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.batch.core.StepContribution;
 import org.springframework.batch.core.scope.context.ChunkContext;
+import org.springframework.batch.core.step.StepContribution;
 import org.springframework.batch.core.step.tasklet.Tasklet;
-import org.springframework.batch.repeat.RepeatStatus;
+import org.springframework.batch.infrastructure.repeat.RepeatStatus;
 import org.springframework.stereotype.Component;
 
 @Slf4j

custom/acme/loan/job/src/test/java/AcmeNoopJobTaskletTest.java

@@ -18,17 +18,17 @@
  * under the License.
  */
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.springframework.batch.repeat.RepeatStatus.FINISHED;
+import static org.springframework.batch.infrastructure.repeat.RepeatStatus.FINISHED;
 
 import com.acme.fineract.loan.job.AcmeNoopJobTasklet;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.batch.core.StepContribution;
 import org.springframework.batch.core.scope.context.ChunkContext;
-import org.springframework.batch.repeat.RepeatStatus;
+import org.springframework.batch.core.step.StepContribution;
+import org.springframework.batch.infrastructure.repeat.RepeatStatus;
 
 @ExtendWith(MockitoExtension.class)
 public class AcmeNoopJobTaskletTest {

fineract-accounting/dependencies.gradle

@@ -32,9 +32,9 @@ dependencies {
             )
 
     implementation(
-            'org.springframework.boot:spring-boot-starter-web',
+            'org.springframework.boot:spring-boot-starter-webmvc',
             'org.springframework.boot:spring-boot-starter-security',
-            'org.springframework.boot:spring-boot-starter-batch',
+            'org.springframework.boot:spring-boot-starter-batch-jdbc',
             'org.springframework.batch:spring-batch-integration',
             'jakarta.ws.rs:jakarta.ws.rs-api',
             'org.glassfish.jersey.media:jersey-media-multipart',
@@ -53,7 +53,7 @@ dependencies {
             'org.springdoc:springdoc-openapi-starter-webmvc-ui',
             'org.mapstruct:mapstruct',
 
-            'io.github.resilience4j:resilience4j-spring-boot3',
+            'io.github.resilience4j:resilience4j-spring-boot4',
             )
     compileOnly 'com.github.spotbugs:spotbugs-annotations'
     compileOnly 'org.projectlombok:lombok'
@@ -76,5 +76,4 @@ dependencies {
         exclude group: 'javax.activation'
         exclude group: 'org.skyscreamer'
     }
-    testImplementation ('org.mockito:mockito-inline')
 }

fineract-accounting/src/main/java/org/apache/fineract/accounting/glaccount/jobs/updatetrialbalancedetails/UpdateTrialBalanceDetailsConfig.java

@@ -24,11 +24,11 @@
 import org.apache.fineract.accounting.journalentry.domain.JournalEntryRepository;
 import org.apache.fineract.infrastructure.core.service.database.RoutingDataSourceServiceFactory;
 import org.apache.fineract.infrastructure.jobs.service.JobName;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.Job;
 import org.springframework.batch.core.job.builder.JobBuilder;
-import org.springframework.batch.core.launch.support.RunIdIncrementer;
+import org.springframework.batch.core.job.parameters.RunIdIncrementer;
 import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.step.Step;
 import org.springframework.batch.core.step.builder.StepBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

fineract-accounting/src/main/java/org/apache/fineract/accounting/glaccount/jobs/updatetrialbalancedetails/UpdateTrialBalanceDetailsTasklet.java

@@ -20,6 +20,7 @@
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.time.OffsetDateTime;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -30,10 +31,10 @@
 import org.apache.fineract.infrastructure.core.service.DateUtils;
 import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil;
 import org.apache.fineract.infrastructure.core.service.database.RoutingDataSourceServiceFactory;
-import org.springframework.batch.core.StepContribution;
 import org.springframework.batch.core.scope.context.ChunkContext;
+import org.springframework.batch.core.step.StepContribution;
 import org.springframework.batch.core.step.tasklet.Tasklet;
-import org.springframework.batch.repeat.RepeatStatus;
+import org.springframework.batch.infrastructure.repeat.RepeatStatus;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.util.CollectionUtils;
 
@@ -77,7 +78,9 @@ private void insertTrialBalanceForDate(LocalDate tbGap) {
             tb.setGlAccountId((Long) row[1]);
             tb.setAmount((BigDecimal) row[2]);
             tb.setEntryDate((LocalDate) row[3]);
-            tb.setTransactionDate((LocalDate) row[4]);
+            // je.createdDate is the OffsetDateTime audit field; EclipseLink 5 materializes it as such in
+            // Object[] projections where EclipseLink 4 handed back a date-castable value
+            tb.setTransactionDate(((OffsetDateTime) row[4]).toLocalDate());
             tb.setClosingBalance((BigDecimal) row[5]);
             return tb;
         }).toList();

fineract-branch/dependencies.gradle

@@ -28,7 +28,7 @@ dependencies {
     implementation(project(path: ':fineract-accounting'))
 
     implementation(
-            'org.springframework.boot:spring-boot-starter-web',
+            'org.springframework.boot:spring-boot-starter-webmvc',
             'org.springframework.boot:spring-boot-starter-security',
             'jakarta.ws.rs:jakarta.ws.rs-api',
             'org.glassfish.jersey.media:jersey-media-multipart',
@@ -47,7 +47,7 @@ dependencies {
             'org.springdoc:springdoc-openapi-starter-webmvc-ui',
             'org.mapstruct:mapstruct',
 
-            'io.github.resilience4j:resilience4j-spring-boot3',
+            'io.github.resilience4j:resilience4j-spring-boot4',
             'org.apache.httpcomponents:httpcore',
             )
     compileOnly 'com.github.spotbugs:spotbugs-annotations'
@@ -71,5 +71,4 @@ dependencies {
         exclude group: 'javax.activation'
         exclude group: 'org.skyscreamer'
     }
-    testImplementation ('org.mockito:mockito-inline')
 }

fineract-charge/dependencies.gradle

@@ -28,7 +28,7 @@ dependencies {
     implementation(project(path: ':fineract-tax'))
 
     implementation(
-            'org.springframework.boot:spring-boot-starter-web',
+            'org.springframework.boot:spring-boot-starter-webmvc',
             'org.springframework.boot:spring-boot-starter-security',
             'jakarta.ws.rs:jakarta.ws.rs-api',
             'org.glassfish.jersey.media:jersey-media-multipart',
@@ -47,7 +47,7 @@ dependencies {
             'org.springdoc:springdoc-openapi-starter-webmvc-ui',
             'org.mapstruct:mapstruct',
 
-            'io.github.resilience4j:resilience4j-spring-boot3',
+            'io.github.resilience4j:resilience4j-spring-boot4',
             'org.apache.httpcomponents:httpcore',
             )
     compileOnly 'com.github.spotbugs:spotbugs-annotations'
@@ -71,5 +71,4 @@ dependencies {
         exclude group: 'javax.activation'
         exclude group: 'org.skyscreamer'
     }
-    testImplementation ('org.mockito:mockito-inline')
 }

fineract-client-feign/dependencies.gradle

@@ -39,8 +39,8 @@ dependencies {
 
     // Test dependencies
     testImplementation(
-            'org.junit.jupiter:junit-jupiter-api:5.14.4',
-            'org.junit.jupiter:junit-jupiter-engine:5.14.4',
+            'org.junit.jupiter:junit-jupiter-api',
+            'org.junit.jupiter:junit-jupiter-engine',
             'org.mockito:mockito-core:5.23.0',
             'org.assertj:assertj-core:3.27.7',
             'org.wiremock:wiremock-standalone'

fineract-client/build.gradle

@@ -270,3 +270,11 @@ configurations {
     generatedCompileClasspath.extendsFrom implementation
     generatedRuntimeClasspath.extendsFrom runtimeClasspath
 }
+
+// The generated SDK targets Java 8; JUnit 6 (managed by the Boot 4 BOM) requires JVM 17+,
+// so keep this module's test stack on the JUnit 5 line
+dependencyManagement {
+    imports {
+        mavenBom 'org.junit:junit-bom:5.14.4'
+    }
+}

fineract-cob/dependencies.gradle

@@ -31,10 +31,10 @@ dependencies {
 
     // implementation dependencies are directly used (compiled against) in src/main (and src/test)
     implementation(
-            'org.springframework.boot:spring-boot-starter-web',
+            'org.springframework.boot:spring-boot-starter-webmvc',
             'org.springframework.boot:spring-boot-starter-security',
             'org.springframework.boot:spring-boot-starter-validation',
-            'org.springframework.boot:spring-boot-starter-batch',
+            'org.springframework.boot:spring-boot-starter-batch-jdbc',
             'org.springframework.batch:spring-batch-integration',
             'jakarta.ws.rs:jakarta.ws.rs-api',
             'org.glassfish.jersey.media:jersey-media-multipart',
@@ -54,7 +54,7 @@ dependencies {
             'org.springdoc:springdoc-openapi-starter-webmvc-ui',
             'org.mapstruct:mapstruct',
 
-            'io.github.resilience4j:resilience4j-spring-boot3',
+            'io.github.resilience4j:resilience4j-spring-boot4',
             'org.apache.httpcomponents:httpcore',
             )
     implementation ('org.springframework.boot:spring-boot-starter-data-jpa') {
@@ -123,7 +123,6 @@ dependencies {
     implementation ('org.quartz-scheduler:quartz') {
         exclude group: 'com.zaxxer', module: 'HikariCP-java7'
     }
-    testImplementation ('org.mockito:mockito-inline')
     implementation('org.apache.avro:avro')
     implementation(
             project(path: ':fineract-avro-schemas')

fineract-cob/src/main/java/org/apache/fineract/cob/COBBusinessStepService.java

@@ -22,7 +22,7 @@
 import java.util.TreeMap;
 import org.apache.fineract.cob.data.BusinessStepNameAndOrder;
 import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
-import org.springframework.lang.NonNull;
+import org.jspecify.annotations.NonNull;
 
 public interface COBBusinessStepService {
 

fineract-cob/src/main/java/org/apache/fineract/cob/COBBusinessStepServiceImpl.java

@@ -36,10 +36,11 @@
 import org.apache.fineract.infrastructure.core.domain.ActionContext;
 import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil;
 import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
+import org.jspecify.annotations.NonNull;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.context.ApplicationContext;
-import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @Slf4j
@@ -56,6 +57,10 @@ public class COBBusinessStepServiceImpl implements COBBusinessStepService {
 
     @SuppressWarnings({ "unchecked" })
     @Override
+    // Spring Batch 6 ChunkOrientedStep runs item processing on task-executor threads OUTSIDE the chunk transaction,
+    // so the business step chain must open its own transaction there; in sequential mode REQUIRED simply joins the
+    // chunk transaction, matching the Batch 5 behavior
+    @Transactional
     public <T extends COBBusinessStep<S>, S extends AbstractPersistableCustom<Long>> S run(TreeMap<Long, String> executionMap, S item) {
         if (executionMap == null || executionMap.isEmpty()) {
             throw new BusinessStepException("Execution map is empty! COB Business step execution skipped!");