This is an automated email from the ASF dual-hosted git repository. arnold pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git
commit f985e0101bed77032e7b350db3f4cafa7b1defb3 Author: Arnold Galovics <[email protected]> AuthorDate: Thu Apr 13 17:53:44 2023 +0200 Dependency fixes --- build.gradle | 2 +- fineract-provider/build.gradle | 6 ++---- fineract-provider/dependencies.gradle | 2 +- .../org/apache/fineract/cob/service/LoanCOBCatchUpServiceImpl.java | 2 +- .../service/ExternalEventConfigurationValidationService.java | 2 +- .../serialization/serializer/loan/LoanBusinessEventSerializer.java | 2 +- .../fineract/infrastructure/jobs/filter/LoanCOBApiFilter.java | 2 +- .../RecalculateInterestForLoanTasklet.java | 2 +- .../classpath/ClasspathDuplicatesStepDefinitions.java | 3 ++- gradle.properties | 2 +- integration-tests/dependencies.gradle | 1 - renovate.json | 4 ++++ 12 files changed, 16 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index dbf20e984..90c86eae3 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,7 @@ buildscript { plugins { id "org.barfuin.gradle.taskinfo" version "2.1.0" id 'com.adarshr.test-logger' version '3.2.0' - id 'com.diffplug.spotless' version '6.18.0' apply false + id 'com.diffplug.spotless' version '6.15.0' apply false id 'org.nosphere.apache.rat' version '0.8.0' 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 diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle index 0a99b128a..924b44829 100644 --- a/fineract-provider/build.gradle +++ b/fineract-provider/build.gradle @@ -111,13 +111,11 @@ modernizer { // If we are running Gradle within Eclipse to enhance classes with OpenJPA, // set the classes directory to point to Eclipse's default build directory -if (project.hasProperty('env') && project.getProperty('env') == 'eclipse') -{ +if (project.hasProperty('env') && project.getProperty('env') == 'eclipse') { sourceSets.main.java.outputDir = new File(rootProject.projectDir, "fineract-provider/bin/main") } -eclipse -{ +eclipse { project { buildCommand([ LaunchConfigHandle: "<project>/.externalToolBuilders/OpenJPA Enhance Builder.launch" ], 'org.eclipse.ui.externaltools.ExternalToolBuilder') } diff --git a/fineract-provider/dependencies.gradle b/fineract-provider/dependencies.gradle index 39b9c0e12..352e51d4c 100644 --- a/fineract-provider/dependencies.gradle +++ b/fineract-provider/dependencies.gradle @@ -169,6 +169,7 @@ dependencies { implementation 'org.apache.commons:commons-math3' + implementation 'io.github.classgraph:classgraph' // testCompile dependencies are ONLY used in src/test, not src/main. // Do NOT repeat dependencies which are ALREADY in implementation or runtimeOnly! @@ -184,5 +185,4 @@ dependencies { exclude group: 'org.skyscreamer' } testImplementation ('org.mockito:mockito-inline') - } diff --git a/fineract-provider/src/main/java/org/apache/fineract/cob/service/LoanCOBCatchUpServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/cob/service/LoanCOBCatchUpServiceImpl.java index f9267695a..e238abb4d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/cob/service/LoanCOBCatchUpServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/cob/service/LoanCOBCatchUpServiceImpl.java @@ -22,7 +22,7 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.List; import lombok.RequiredArgsConstructor; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.fineract.cob.data.IsCatchUpRunningDTO; import org.apache.fineract.cob.data.LoanIdAndLastClosedBusinessDate; import org.apache.fineract.cob.data.OldestCOBProcessedLoanDTO; diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/ExternalEventConfigurationValidationService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/ExternalEventConfigurationValidationService.java index 095dcb0db..79dabacc7 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/ExternalEventConfigurationValidationService.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/ExternalEventConfigurationValidationService.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.fineract.infrastructure.core.domain.FineractPlatformTenant; import org.apache.fineract.infrastructure.core.service.tenant.TenantDetailsService; import org.apache.fineract.infrastructure.event.business.domain.BulkBusinessEvent; diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/loan/LoanBusinessEventSerializer.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/loan/LoanBusinessEventSerializer.java index e7477b843..8e30978f4 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/loan/LoanBusinessEventSerializer.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/event/external/service/serialization/serializer/loan/LoanBusinessEventSerializer.java @@ -21,7 +21,7 @@ package org.apache.fineract.infrastructure.event.external.service.serialization. import java.util.Collection; import lombok.RequiredArgsConstructor; import org.apache.avro.generic.GenericContainer; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.fineract.avro.generator.ByteBufferSerializable; import org.apache.fineract.avro.loan.v1.LoanAccountDataV1; import org.apache.fineract.infrastructure.event.business.domain.BusinessEvent; diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/filter/LoanCOBApiFilter.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/filter/LoanCOBApiFilter.java index 1df21bd9e..41ef30570 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/filter/LoanCOBApiFilter.java +++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/filter/LoanCOBApiFilter.java @@ -32,7 +32,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.fineract.batch.domain.BatchRequest; import org.apache.fineract.cob.data.LoanIdAndLastClosedBusinessDate; diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/recalculateinterestforloan/RecalculateInterestForLoanTasklet.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/recalculateinterestforloan/RecalculateInterestForLoanTasklet.java index 7d70c478b..114b85d0d 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/recalculateinterestforloan/RecalculateInterestForLoanTasklet.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/recalculateinterestforloan/RecalculateInterestForLoanTasklet.java @@ -30,7 +30,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.fineract.infrastructure.jobs.exception.JobExecutionException; import org.apache.fineract.organisation.office.data.OfficeData; import org.apache.fineract.organisation.office.exception.OfficeNotFoundException; diff --git a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/classpath/ClasspathDuplicatesStepDefinitions.java b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/classpath/ClasspathDuplicatesStepDefinitions.java index e4490d6a3..67e0e2c75 100644 --- a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/classpath/ClasspathDuplicatesStepDefinitions.java +++ b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/classpath/ClasspathDuplicatesStepDefinitions.java @@ -93,7 +93,8 @@ public class ClasspathDuplicatesStepDefinitions implements En { return resourcePath.equals("META-INF/MANIFEST.MF") || resourcePath.equals("META-INF/INDEX.LIST") || resourcePath.equals("META-INF/ORACLE_J.SF") || resourcePath.toUpperCase().startsWith("META-INF/ASL") || resourcePath.toUpperCase().startsWith("META-INF/NOTICE") || resourcePath.toUpperCase().startsWith("META-INF/LICENSE") - || resourcePath.toUpperCase().startsWith("LICENSE") || resourcePath.toUpperCase().startsWith("LICENSE/NOTICE") + || resourcePath.toUpperCase().startsWith("META-INF/COPYRIGHT") || resourcePath.toUpperCase().startsWith("LICENSE") + || resourcePath.toUpperCase().startsWith("LICENSE/NOTICE") // list formerly in ClasspathHellDuplicatesCheckRule (moved here // in INFRAUTILS-52) || resourcePath.endsWith(".txt") || resourcePath.endsWith("LICENSE") || resourcePath.endsWith("license.html") diff --git a/gradle.properties b/gradle.properties index f700a74fd..ff3a134e5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # -org.gradle.jvmargs=-Xmx4g --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UN [...] +org.gradle.jvmargs=-Xmx6g --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UN [...] buildType=BUILD org.gradle.caching=true org.gradle.parallel=true diff --git a/integration-tests/dependencies.gradle b/integration-tests/dependencies.gradle index 6404bccdc..1aa178779 100644 --- a/integration-tests/dependencies.gradle +++ b/integration-tests/dependencies.gradle @@ -49,5 +49,4 @@ dependencies { testAnnotationProcessor 'org.mapstruct:mapstruct-processor' testImplementation 'com.github.tomakehurst:wiremock-jre8:2.35.0' - } diff --git a/renovate.json b/renovate.json index 537beaab1..27ac89ebf 100644 --- a/renovate.json +++ b/renovate.json @@ -98,6 +98,10 @@ "matchPackageNames": ["org.openapi.generator"], "allowedVersions": "<=6.2.1" }, + { + "matchPackageNames": ["com.diffplug.spotless"], + "allowedVersions": "<=6.15.0" + }, { "depTypeList": ["dependencies"], "updateTypes": ["patch", "minor"],
