FINERACT-2181: Upgrade Spring dependencies

This commit is contained in:
Adam Saghy
2025-03-27 14:07:40 +01:00
parent bb5078b5da
commit 0fc1c3e20e
3 changed files with 6 additions and 5 deletions
+1 -1
View File
@@ -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
@@ -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'
@@ -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<String, Object> vendorProperties = getVendorProperties();
Map<String, Object> vendorProperties = getVendorProperties(getDataSource());
String[] packagesToScan = getPackagesToScan();
return factoryBuilder.dataSource(getDataSource()).properties(vendorProperties).persistenceUnit("jpa-pu").packages(packagesToScan)
.jta(false).build();
}
@Override
protected Map<String, Object> getVendorProperties() {
protected Map<String, Object> getVendorProperties(DataSource dataSource) {
Map<String, Object> vendorProperties = new HashMap<>();
vendorProperties.put(PersistenceUnitProperties.WEAVING, "static");
vendorProperties.put(PersistenceUnitProperties.PERSISTENCE_CONTEXT_CLOSE_ON_COMMIT, "true");