This is an automated email from the ASF dual-hosted git repository. ptuomola pushed a commit to branch renovate/all-minor-patch in repository https://gitbox.apache.org/repos/asf/fineract.git
commit de51a4011af95e1bb3af3ee60ea1e8b8c512e2af Author: Renovate <[email protected]> AuthorDate: Sat Apr 23 01:00:44 2022 +0000 chore(deps): update all non-major dependencies --- build.gradle | 33 +++++++++++----------- fineract-provider/build.gradle | 6 ++-- fineract-provider/dependencies.gradle | 4 +-- .../TellerManagementReadPlatformServiceImpl.java | 16 ----------- .../rate/service/RateReadServiceImpl.java | 9 ------ 5 files changed, 21 insertions(+), 47 deletions(-) diff --git a/build.gradle b/build.gradle index 895d587d7..419a124ed 100644 --- a/build.gradle +++ b/build.gradle @@ -58,13 +58,13 @@ plugins { id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "org.barfuin.gradle.taskinfo" version "1.4.0" id 'com.adarshr.test-logger' version '3.2.0' - id 'com.diffplug.spotless' version '6.4.1' apply false + id 'com.diffplug.spotless' version '6.5.0' apply false id 'org.nosphere.apache.rat' version '0.7.1' apply false id 'com.github.hierynomus.license' version '0.16.1' apply false id 'com.github.jk1.dependency-license-report' version '2.1' apply false id 'org.openapi.generator' version '5.4.0' apply false id 'org.zeroturnaround.gradle.jrebel' version '1.1.11' apply false - id 'org.springframework.boot' version '2.6.6' apply false + id 'org.springframework.boot' version '2.6.7' apply false id 'net.ltgt.errorprone' version '2.0.2' apply false id 'io.swagger.core.v3.swagger-gradle-plugin' version '2.2.0' apply false id 'com.gorylenko.gradle-git-properties' version '2.4.0' apply false @@ -114,14 +114,14 @@ allprojects { // https://github.com/spring-gradle-plugins/dependency-management-plugin dependencyManagement { imports { - mavenBom 'org.springframework:spring-framework-bom:5.3.18' - mavenBom 'org.springframework.boot:spring-boot-dependencies:2.6.6' - mavenBom 'org.jetbrains.kotlin:kotlin-bom:1.6.20' + mavenBom 'org.springframework:spring-framework-bom:5.3.19' + mavenBom 'org.springframework.boot:spring-boot-dependencies:2.6.7' + mavenBom 'org.jetbrains.kotlin:kotlin-bom:1.6.21' mavenBom 'org.junit:junit-bom:5.8.2' - mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.2' - mavenBom 'io.cucumber:cucumber-bom:7.2.3' - mavenBom 'io.netty:netty-bom:4.1.75.Final' - mavenBom 'org.mockito:mockito-bom:4.4.0' + mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.2.20220328' + mavenBom 'io.cucumber:cucumber-bom:7.3.2' + mavenBom 'io.netty:netty-bom:4.1.76.Final' + mavenBom 'org.mockito:mockito-bom:4.5.1' mavenBom 'io.github.swagger2markup:swagger2markup-bom:1.3.4' } @@ -147,9 +147,9 @@ allprojects { dependency 'org.apache.commons:commons-email:1.5' dependency 'commons-io:commons-io:2.11.0' dependency 'com.github.librepdf:openpdf:1.3.27' - dependency 'org.mnode.ical4j:ical4j:3.2.1' + dependency 'org.mnode.ical4j:ical4j:3.2.2' dependency 'org.quartz-scheduler:quartz:2.3.2' - dependency 'com.amazonaws:aws-java-sdk-s3:1.12.192' + dependency 'com.amazonaws:aws-java-sdk-s3:1.12.205' dependency 'org.ehcache:ehcache:3.10.0' dependency 'com.github.spullara.mustache.java:compiler:0.9.10' dependency 'com.jayway.jsonpath:json-path:2.7.0' @@ -162,15 +162,15 @@ allprojects { dependency 'org.apache.bval:org.apache.bval.bundle:2.0.5' dependency 'joda-time:joda-time:2.10.14' - dependency 'io.github.classgraph:classgraph:4.8.143' + dependency 'io.github.classgraph:classgraph:4.8.146' dependency 'org.awaitility:awaitility:4.2.0' dependency 'com.github.spotbugs:spotbugs-annotations:4.6.0' dependency 'javax.cache:cache-api:1.1.1' - dependency 'org.mock-server:mockserver-junit-jupiter:5.13.1' + dependency 'org.mock-server:mockserver-junit-jupiter:5.13.2' dependency 'org.webjars.npm:swagger-ui-dist:4.10.3' dependency 'org.webjars:webjars-locator-core:0.50' dependency 'com.icegreen:greenmail-junit5:1.6.8' - dependency 'com.intuit.karate:karate-junit5:1.2.0.RC5' + dependency 'com.intuit.karate:karate-junit5:1.2.0.RC6' // fineract client dependencies dependency "com.squareup.retrofit2:retrofit:$retrofitVersion" @@ -205,7 +205,7 @@ allprojects { dependency "commons-codec:commons-codec:1.15" dependency "org.bouncycastle:bcpkix-jdk15to18:1.70" dependency "org.bouncycastle:bcprov-jdk15to18:1.70" - dependency "org.projectlombok:lombok:1.18.22" + dependency "org.projectlombok:lombok:1.18.24" dependency ('org.apache.activemq:activemq-broker:5.17.0') { @@ -532,7 +532,7 @@ configure(project.fineractJavaProjects) { // Configuration for the errorprone plugin // https://github.com/tbroyer/gradle-errorprone-plugin dependencies { - errorprone "com.google.errorprone:error_prone_core:2.11.0" + errorprone "com.google.errorprone:error_prone_core:2.13.1" } tasks.withType(JavaCompile) { @@ -604,7 +604,6 @@ configure(project.fineractJavaProjects) { "MissingCasesInEnumSwitch", "ReferenceEquality", "UndefinedEquals", - "PublicConstructorForAbstractClass", "UnescapedEntity", "ModifyCollectionInEnhancedForLoop", "NonCanonicalType", diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle index d6874a758..1f8f86b65 100644 --- a/fineract-provider/build.gradle +++ b/fineract-provider/build.gradle @@ -158,7 +158,7 @@ configurations { } dependencies { driver 'org.mariadb.jdbc:mariadb-java-client:2.7.5' - driver 'org.postgresql:postgresql:42.3.3' + driver 'org.postgresql:postgresql:42.3.4' } URLClassLoader loader = GroovyObject.class.classLoader @@ -213,7 +213,7 @@ bootRun { dependencies { implementation 'org.mariadb.jdbc:mariadb-java-client:2.7.5' - implementation 'org.postgresql:postgresql:42.3.3' + implementation 'org.postgresql:postgresql:42.3.4' } classpath += files("build/generated/swagger-ui") @@ -293,7 +293,7 @@ jib { dependencies { implementation 'org.mariadb.jdbc:mariadb-java-client:2.7.5' - implementation 'org.postgresql:postgresql:42.3.3' + implementation 'org.postgresql:postgresql:42.3.4' } extraDirectories { diff --git a/fineract-provider/dependencies.gradle b/fineract-provider/dependencies.gradle index abd858d54..536c23c2c 100644 --- a/fineract-provider/dependencies.gradle +++ b/fineract-provider/dependencies.gradle @@ -65,7 +65,7 @@ dependencies { 'io.swagger.core.v3:swagger-annotations', 'org.webjars:webjars-locator-core', - 'com.google.cloud.sql:mysql-socket-factory-connector-j-8:1.4.4', + 'com.google.cloud.sql:mysql-socket-factory-connector-j-8:1.5.0', 'com.squareup.retrofit2:converter-gson', 'org.apache.commons:commons-email' ) @@ -106,7 +106,7 @@ dependencies { exclude group: 'com.sun.activation' } - implementation('org.owasp.esapi:esapi:2.2.3.1') { + implementation('org.owasp.esapi:esapi:2.3.0.0') { exclude group: 'org.slf4j' exclude group: 'log4j' exclude group: 'commons-logging' diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerManagementReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerManagementReadPlatformServiceImpl.java index 57223fe54..5ebb7d10b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerManagementReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerManagementReadPlatformServiceImpl.java @@ -130,22 +130,6 @@ public class TellerManagementReadPlatformServiceImpl implements TellerManagement private static final class TellerInOfficeHierarchyMapper implements RowMapper<TellerData> { - public String schema() { - - final StringBuilder sqlBuilder = new StringBuilder(200); - - sqlBuilder.append("t.id as id,t.office_id as office_id, t.name as teller_name, t.description as description, "); - sqlBuilder.append("t.valid_from as start_date, t.valid_to as end_date, t.state as status, o.name as office_name "); - sqlBuilder.append("t.debit_account_id as debit_account_id, t.credit_account_id as credit_account_id "); - sqlBuilder.append("from m_office o "); - sqlBuilder.append("join m_office ohierarchy on o.hierarchy like concat(ohierarchy.hierarchy, '%') "); - sqlBuilder.append("join m_tellers t on t.office_id = ohierarchy.id and s.is_active=true "); - - sqlBuilder.append("where o.id = ? "); - - return sqlBuilder.toString(); - } - @Override public TellerData mapRow(final ResultSet rs, final int rowNum) throws SQLException { diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateReadServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateReadServiceImpl.java index 6e2ba75fc..67b57ff7c 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateReadServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateReadServiceImpl.java @@ -27,7 +27,6 @@ import java.util.List; import org.apache.fineract.infrastructure.core.data.EnumOptionData; import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext; import org.apache.fineract.portfolio.rate.data.RateData; -import org.apache.fineract.portfolio.rate.domain.Rate; import org.apache.fineract.portfolio.rate.domain.RateAppliesTo; import org.apache.fineract.portfolio.rate.exception.RateNotFoundException; import org.springframework.beans.factory.annotation.Autowired; @@ -137,13 +136,5 @@ public class RateReadServiceImpl implements RateReadService { return RateData.instance(id, name, percentage, productAppliesTo, active); } - public RateData mapRow(Rate rateResponse, int i) { - final Long id = rateResponse.getId(); - final String name = rateResponse.getName(); - final BigDecimal percentage = rateResponse.getPercentage(); - final EnumOptionData productApply = RateEnumerations.rateAppliesTo(rateResponse.getProductApply()); - final boolean active = rateResponse.isActive(); - return RateData.instance(id, name, percentage, productApply, active); - } } }
