diff --git a/api/build.gradle b/api/build.gradle index 88b2584..2dbf701 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -24,9 +24,9 @@ buildscript { plugins { id 'com.github.hierynomus.license' version '0.15.0' id 'org.nosphere.apache.rat' version '0.6.0' - id 'com.jfrog.artifactory' version '4.15.1' - id 'org.springframework.boot' version '2.2.6.RELEASE' - id "io.spring.dependency-management" version "1.0.9.RELEASE" + id 'com.jfrog.artifactory' version '4.18.2' + id 'org.springframework.boot' version '2.4.1' + id "io.spring.dependency-management" version "1.0.10.RELEASE" id 'maven-publish' id 'java' id 'idea' @@ -38,7 +38,7 @@ dependencies { compile( [group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign'], [group: 'org.apache.fineract.cn', name: 'api', version: versions.frameworkapi], - [group: 'org.hibernate', name: 'hibernate-validator', version: versions.validator] + [group: 'org.hibernate.validator', name: 'hibernate-validator', version: versions.hibernatevalidator] ) testCompile( diff --git a/component-test/build.gradle b/component-test/build.gradle index 31aee84..d3a942f 100644 --- a/component-test/build.gradle +++ b/component-test/build.gradle @@ -17,7 +17,7 @@ buildscript { ext { - springBootVersion = '2.2.6.RELEASE' + springBootVersion = '2.4.1' } repositories { @@ -25,16 +25,16 @@ buildscript { } dependencies { - classpath("org.asciidoctor:asciidoctor-gradle-plugin:1.5.3") + classpath("org.asciidoctor:asciidoctor-gradle-plugin:1.5.7") } } plugins { id 'com.github.hierynomus.license' version '0.15.0' id 'org.nosphere.apache.rat' version '0.6.0' - id 'com.jfrog.artifactory' version '4.15.1' - id 'org.springframework.boot' version '2.2.6.RELEASE' - id "io.spring.dependency-management" version "1.0.9.RELEASE" + id 'com.jfrog.artifactory' version '4.18.2' + id 'org.springframework.boot' version '2.4.1' + id "io.spring.dependency-management" version "1.0.10.RELEASE" id 'maven-publish' id 'java' id 'idea' @@ -56,9 +56,9 @@ dependencies { [group: 'org.apache.fineract.cn', name: 'api', version: versions.frameworkapi], [group: 'org.apache.fineract.cn', name: 'test', version: versions.frameworktest], [group: 'org.apache.fineract.cn', name: 'lang', version: versions.frameworklang], - [group: 'org.springframework.boot', name: 'spring-boot-starter-test'], + [group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.4.1'], [group: 'org.springframework.restdocs', name: 'spring-restdocs-mockmvc'], - [group: 'junit', name: 'junit', version: '4.12'] + [group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.0'] ) } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 290541c..4d9ca16 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/importer/build.gradle b/importer/build.gradle index 6bc0fc1..a02dc21 100644 --- a/importer/build.gradle +++ b/importer/build.gradle @@ -17,20 +17,24 @@ buildscript { ext { - springBootVersion = '2.2.6.RELEASE' + springBootVersion = '2.4.1' } repositories { jcenter() } + + dependencies { + classpath "io.spring.gradle:dependency-management-plugin:1.0.10.RELEASE" + } } plugins { id 'com.github.hierynomus.license' version '0.15.0' id 'org.nosphere.apache.rat' version '0.6.0' - id 'com.jfrog.artifactory' version '4.15.1' - id 'org.springframework.boot' version '2.2.6.RELEASE' - id "io.spring.dependency-management" version "1.0.9.RELEASE" + id 'com.jfrog.artifactory' version '4.18.2' + id 'org.springframework.boot' version '2.4.1' + id "io.spring.dependency-management" version "1.0.10.RELEASE" id 'maven-publish' id 'java' id 'idea' @@ -38,6 +42,8 @@ plugins { apply from: '../shared.gradle' +apply plugin: "io.spring.dependency-management" + bootJar { enabled = false } diff --git a/service/build.gradle b/service/build.gradle index d50b36c..80935e5 100644 --- a/service/build.gradle +++ b/service/build.gradle @@ -17,19 +17,22 @@ buildscript { ext { - springBootVersion = '2.2.6.RELEASE' + springBootVersion = '2.4.1' } repositories { jcenter() } + dependencies { + classpath 'io.spring.gradle:dependency-management-plugin:1.0.10.RELEASE' + } } plugins { id 'com.github.hierynomus.license' version '0.15.0' id 'org.nosphere.apache.rat' version '0.6.0' - id 'com.jfrog.artifactory' version '4.15.1' - id 'org.springframework.boot' version '2.2.6.RELEASE' - id "io.spring.dependency-management" version "1.0.9.RELEASE" + id 'com.jfrog.artifactory' version '4.18.2' + id 'org.springframework.boot' version '2.4.1' + id 'io.spring.dependency-management' version '1.0.10.RELEASE' id 'maven-publish' id 'java' id 'idea' @@ -37,6 +40,8 @@ plugins { apply from: '../shared.gradle' +apply plugin: 'io.spring.dependency-management' + bootJar { enabled = true classifier = 'boot' @@ -56,9 +61,9 @@ dependencies { [group: 'org.apache.fineract.cn', name: 'cassandra', version: versions.frameworkcassandra], [group: 'org.apache.fineract.cn', name: 'postgresql', version: versions.frameworkpostgresql], [group: 'org.apache.fineract.cn', name: 'command', version: versions.frameworkcommand], - [group: 'org.hibernate', name: 'hibernate-validator', version: versions.validator], - [group: 'io.netty', name: 'netty-all', version: '4.1.39.Final'], - [group: 'io.netty', name: 'netty-transport-native-epoll', version: '4.1.39.Final'] + [group: 'org.hibernate.validator', name: 'hibernate-validator', version: versions.hibernatevalidator], + [group: 'io.netty', name: 'netty-all', version: '4.1.55.Final'], + [group: 'io.netty', name: 'netty-transport-native-epoll', version: '4.1.55.Final'] ) } diff --git a/service/src/main/java/org/apache/fineract/cn/accounting/service/AccountingServiceConfiguration.java b/service/src/main/java/org/apache/fineract/cn/accounting/service/AccountingServiceConfiguration.java index a31f8f5..4f792bd 100644 --- a/service/src/main/java/org/apache/fineract/cn/accounting/service/AccountingServiceConfiguration.java +++ b/service/src/main/java/org/apache/fineract/cn/accounting/service/AccountingServiceConfiguration.java @@ -34,8 +34,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.PathMatchConfigurer; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration @EnableAutoConfiguration @@ -56,7 +55,7 @@ CustomerManager.class } ) -public class AccountingServiceConfiguration extends WebMvcConfigurerAdapter { +public class AccountingServiceConfiguration implements WebMvcConfigurer { public AccountingServiceConfiguration() { super(); @@ -67,8 +66,4 @@ public Logger logger() { return LoggerFactory.getLogger(ServiceConstants.LOGGER_NAME); } - @Override - public void configurePathMatch(final PathMatchConfigurer configurer) { - configurer.setUseSuffixPatternMatch(Boolean.FALSE); - } } diff --git a/service/src/main/java/org/apache/fineract/cn/accounting/service/internal/command/handler/AccountCommandHandler.java b/service/src/main/java/org/apache/fineract/cn/accounting/service/internal/command/handler/AccountCommandHandler.java index 447bc27..6490b41 100644 --- a/service/src/main/java/org/apache/fineract/cn/accounting/service/internal/command/handler/AccountCommandHandler.java +++ b/service/src/main/java/org/apache/fineract/cn/accounting/service/internal/command/handler/AccountCommandHandler.java @@ -414,7 +414,7 @@ public String deleteAccount(final DeleteAccountCommand deleteAccountCommand) { final AccountEntity accountEntity = this.accountRepository.findByIdentifier(accountIdentifier); final List commandEntities = this.commandRepository.findByAccount(accountEntity); - this.commandRepository.delete(commandEntities); + this.commandRepository.deleteAll(commandEntities); this.accountRepository.delete(accountEntity); return accountIdentifier; diff --git a/service/src/main/java/org/apache/fineract/cn/accounting/service/rest/paging/PageableBuilder.java b/service/src/main/java/org/apache/fineract/cn/accounting/service/rest/paging/PageableBuilder.java index df9aec7..f7d472d 100644 --- a/service/src/main/java/org/apache/fineract/cn/accounting/service/rest/paging/PageableBuilder.java +++ b/service/src/main/java/org/apache/fineract/cn/accounting/service/rest/paging/PageableBuilder.java @@ -35,7 +35,7 @@ public static Pageable create( final Integer sizeToUse = size != null ? size : 20; final String sortColumnToUse = sortColumn != null ? sortColumn : "identifier"; final Sort.Direction direction = sortDirection != null ? Sort.Direction.valueOf(sortDirection.toUpperCase()) : Sort.Direction.ASC; - return new PageRequest(pageIndexToUse, sizeToUse, direction, sortColumnToUse); + return PageRequest.of(pageIndexToUse, sizeToUse, direction, sortColumnToUse); } } diff --git a/shared.gradle b/shared.gradle index c96c300..e4b9407 100644 --- a/shared.gradle +++ b/shared.gradle @@ -28,8 +28,8 @@ ext.versions = [ frameworktest : 'spring_boot_2-SNAPSHOT', frameworkasync : 'spring_boot_2-SNAPSHOT', frameworkcustomer : 'spring_boot_2-SNAPSHOT', - apachecsvreader : '1.4', - validator : '6.1.3.Final', + apachecsvreader : '1.8', + hibernatevalidator : '7.0.0.Final', ] tasks.withType(JavaCompile) { @@ -45,25 +45,24 @@ repositories { dependencyManagement { imports { - mavenBom 'io.spring.platform:platform-bom:Cairo-SR8' - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Hoxton.SR4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:Hoxton.SR9' } } // override certain dependency provided by Spring platform using newer releases -ext['cassandra.version'] = '3.6' -ext['cassandra-driver.version'] = '3.1.2' +ext['cassandra.version'] = '3.11.9' +ext['cassandra-driver.version'] = '4.9.0' ext['activemq.version'] = '5.13.2' ext['spring-data-releasetrain.version'] = 'Gosling-SR2A' dependencies { compile( - [group: 'com.google.code.findbugs', name: 'jsr305'], + [group: 'com.github.spotbugs', name: 'spotbugs', version: '4.2.0'], [group: 'org.apache.fineract.cn', name: 'postgresql', version: versions.frameworkpostgresql] ) testCompile( - [group: 'org.springframework.boot', name: 'spring-boot-starter-test'] + [group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.4.1'] ) }