From 0fc1c3e20e46e58026226b6aee197975d2479e27 Mon Sep 17 00:00:00 2001 From: Adam Saghy Date: Thu, 27 Mar 2025 11:13:33 +0100 Subject: [PATCH] FINERACT-2181: Upgrade Spring dependencies --- build.gradle | 2 +- .../src/main/groovy/org.apache.fineract.dependencies.gradle | 4 ++-- .../fineract/infrastructure/core/config/jpa/JPAConfig.java | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 2e7db1298..d2c71b738 100644 --- a/build.gradle +++ b/build.gradle @@ -97,7 +97,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.3' apply false + id 'org.springframework.boot' version '3.4.4' 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 aa6767303..2b34d1fe2 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.1.14' - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.4.3' + mavenBom 'org.springframework:spring-framework-bom:6.2.5' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.4.4' 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' diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/config/jpa/JPAConfig.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/config/jpa/JPAConfig.java index 19ffed826..9a4f64e3e 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/config/jpa/JPAConfig.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/config/jpa/JPAConfig.java @@ -24,6 +24,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; +import javax.sql.DataSource; import org.apache.fineract.infrastructure.core.auditing.JpaAuditingHandlerRegistrar; import org.apache.fineract.infrastructure.core.domain.AuditorAwareImpl; import org.apache.fineract.infrastructure.core.persistence.DatabaseSelectingPersistenceUnitPostProcessor; @@ -78,14 +79,14 @@ public class JPAConfig extends JpaBaseConfiguration { @DependsOn("tenantDatabaseUpgradeService") public LocalContainerEntityManagerFactoryBean entityManagerFactory(EntityManagerFactoryBuilder factoryBuilder, PersistenceManagedTypes persistenceManagedTypes) { - Map vendorProperties = getVendorProperties(); + Map vendorProperties = getVendorProperties(getDataSource()); String[] packagesToScan = getPackagesToScan(); return factoryBuilder.dataSource(getDataSource()).properties(vendorProperties).persistenceUnit("jpa-pu").packages(packagesToScan) .jta(false).build(); } @Override - protected Map getVendorProperties() { + protected Map getVendorProperties(DataSource dataSource) { Map vendorProperties = new HashMap<>(); vendorProperties.put(PersistenceUnitProperties.WEAVING, "static"); vendorProperties.put(PersistenceUnitProperties.PERSISTENCE_CONTEXT_CLOSE_ON_COMMIT, "true");