You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ar...@apache.org on 2023/04/15 19:40:57 UTC
[fineract] branch develop updated (c18e50683 -> f985e0101)
This is an automated email from the ASF dual-hosted git repository.
arnold pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
from c18e50683 FINERACT-1913-Initializing-db-connection-pool-at-startup
new bbcfc5f3f chore(deps): update all non-major dependencies
new f985e0101 Dependency fixes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/build-mariadb.yml | 2 +-
.github/workflows/build-mysql.yml | 2 +-
.github/workflows/build-postgresql.yml | 2 +-
build.gradle | 8 +--
.../groovy/org.apache.fineract.dependencies.gradle | 64 +++++++++++-----------
fineract-provider/build.gradle | 6 +-
fineract-provider/dependencies.gradle | 2 +-
.../cob/service/LoanCOBCatchUpServiceImpl.java | 2 +-
...xternalEventConfigurationValidationService.java | 2 +-
.../loan/LoanBusinessEventSerializer.java | 2 +-
.../jobs/filter/LoanCOBApiFilter.java | 2 +-
.../RecalculateInterestForLoanTasklet.java | 2 +-
.../ClasspathDuplicatesStepDefinitions.java | 3 +-
gradle.properties | 2 +-
integration-tests/dependencies.gradle | 1 -
renovate.json | 4 ++
16 files changed, 54 insertions(+), 52 deletions(-)
[fineract] 01/02: chore(deps): update all non-major dependencies
Posted by ar...@apache.org.
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 bbcfc5f3f36170510369d3e54286f4a40024d453
Author: Renovate <bo...@renovateapp.com>
AuthorDate: Thu Apr 13 10:30:38 2023 +0000
chore(deps): update all non-major dependencies
---
.github/workflows/build-mariadb.yml | 2 +-
.github/workflows/build-mysql.yml | 2 +-
.github/workflows/build-postgresql.yml | 2 +-
build.gradle | 10 ++--
.../groovy/org.apache.fineract.dependencies.gradle | 64 +++++++++++-----------
5 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/.github/workflows/build-mariadb.yml b/.github/workflows/build-mariadb.yml
index f0e4678d8..fd9032567 100644
--- a/.github/workflows/build-mariadb.yml
+++ b/.github/workflows/build-mariadb.yml
@@ -18,7 +18,7 @@ jobs:
options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
mock-oauth2-server:
- image: ghcr.io/navikt/mock-oauth2-server:0.5.7
+ image: ghcr.io/navikt/mock-oauth2-server:0.5.8
ports:
- 9000:9000
env:
diff --git a/.github/workflows/build-mysql.yml b/.github/workflows/build-mysql.yml
index a01a77665..3ad98a7ea 100644
--- a/.github/workflows/build-mysql.yml
+++ b/.github/workflows/build-mysql.yml
@@ -18,7 +18,7 @@ jobs:
options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
mock-oauth2-server:
- image: ghcr.io/navikt/mock-oauth2-server:0.5.7
+ image: ghcr.io/navikt/mock-oauth2-server:0.5.8
ports:
- 9000:9000
env:
diff --git a/.github/workflows/build-postgresql.yml b/.github/workflows/build-postgresql.yml
index 4b550a6a0..94a52a6d6 100644
--- a/.github/workflows/build-postgresql.yml
+++ b/.github/workflows/build-postgresql.yml
@@ -19,7 +19,7 @@ jobs:
options: --health-cmd="pg_isready -q -d postgres -U root" --health-interval=5s --health-timeout=2s --health-retries=3
mock-oauth2-server:
- image: ghcr.io/navikt/mock-oauth2-server:0.5.7
+ image: ghcr.io/navikt/mock-oauth2-server:0.5.8
ports:
- 9000:9000
env:
diff --git a/build.gradle b/build.gradle
index 785dfddaa..dbf20e984 100644
--- a/build.gradle
+++ b/build.gradle
@@ -59,15 +59,15 @@ 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.15.0' apply false
+ id 'com.diffplug.spotless' version '6.18.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
id 'org.openapi.generator' version '6.2.1' apply false
id 'org.zeroturnaround.gradle.jrebel' version '1.1.12' apply false
- id 'org.springframework.boot' version '2.7.9' apply false
+ id 'org.springframework.boot' version '2.7.10' apply false
id 'net.ltgt.errorprone' version '3.0.1' apply false
- id 'io.swagger.core.v3.swagger-gradle-plugin' version '2.2.8' apply false
+ id 'io.swagger.core.v3.swagger-gradle-plugin' version '2.2.9' apply false
id 'com.gorylenko.gradle-git-properties' version '2.4.1' apply false
id 'org.asciidoctor.jvm.convert' version '3.3.2' apply false
id 'org.asciidoctor.jvm.pdf' version '3.3.2' apply false
@@ -79,9 +79,9 @@ plugins {
id 'fr.brouillard.oss.gradle.jgitver' version '0.10.0-rc03'
id 'org.sonarqube' version '4.0.0.2929'
id 'com.github.andygoossens.modernizer' version '1.7.0' apply false
- id 'com.github.spotbugs' version '5.0.13' apply false
+ id 'com.github.spotbugs' version '5.0.14' apply false
id 'se.thinkcode.cucumber-runner' version '0.0.11' apply false
- id "com.github.davidmc24.gradle.plugin.avro-base" version "1.6.0" apply false
+ id "com.github.davidmc24.gradle.plugin.avro-base" version "1.7.0" apply false
}
apply from: "${rootDir}/buildSrc/src/main/groovy/org.apache.fineract.release.gradle"
diff --git a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle
index 8eaf87ccd..1c4fe773d 100644
--- a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle
+++ b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle
@@ -22,15 +22,15 @@ apply plugin: 'io.spring.dependency-management'
// https://github.com/spring-gradle-plugins/dependency-management-plugin
dependencyManagement {
imports {
- mavenBom 'org.springframework:spring-framework-bom:5.3.25'
- mavenBom 'org.springframework.boot:spring-boot-dependencies:2.7.9'
- mavenBom 'org.jetbrains.kotlin:kotlin-bom:1.8.10'
+ mavenBom 'org.springframework:spring-framework-bom:5.3.27'
+ mavenBom 'org.springframework.boot:spring-boot-dependencies:2.7.10'
+ mavenBom 'org.jetbrains.kotlin:kotlin-bom:1.8.20'
mavenBom 'org.junit:junit-bom:5.9.2'
mavenBom 'com.fasterxml.jackson:jackson-bom:2.14.2'
- mavenBom 'io.cucumber:cucumber-bom:7.11.1'
- mavenBom 'io.netty:netty-bom:4.1.89.Final'
- mavenBom 'org.mockito:mockito-bom:5.1.1'
- mavenBom 'software.amazon.awssdk:bom:2.20.12'
+ mavenBom 'io.cucumber:cucumber-bom:7.11.2'
+ mavenBom 'io.netty:netty-bom:4.1.91.Final'
+ mavenBom 'org.mockito:mockito-bom:5.3.0'
+ mavenBom 'software.amazon.awssdk:bom:2.20.45'
}
dependencies {
@@ -62,15 +62,15 @@ dependencyManagement {
}
dependency 'commons-io:commons-io:2.11.0'
dependency 'com.github.librepdf:openpdf:1.3.30'
- dependency ('org.mnode.ical4j:ical4j:3.2.9') {
+ dependency ('org.mnode.ical4j:ical4j:3.2.11') {
exclude 'com.sun.mail:javax.mail'
}
dependency 'org.apache.commons:commons-csv:1.10.0'
dependency 'org.quartz-scheduler:quartz:2.3.2'
- dependency 'software.amazon.awssdk:bom:2.20.12'
+ dependency 'software.amazon.awssdk:bom:2.20.45'
dependency 'org.ehcache:ehcache:3.10.8'
dependency 'com.github.spullara.mustache.java:compiler:0.9.10'
- dependency 'com.jayway.jsonpath:json-path:2.7.0'
+ dependency 'com.jayway.jsonpath:json-path:2.8.0'
dependency 'org.apache.tika:tika-core:2.7.0'
dependency ('org.apache.tika:tika-parser-microsoft-module:2.7.0') {
exclude 'org.bouncycastle:bcprov-jdk15on'
@@ -115,16 +115,16 @@ dependencyManagement {
dependency 'org.glassfish.jersey.media:jersey-media-multipart:2.36'
dependency 'org.glassfish.jaxb:jaxb-runtime:2.3.6' // Swagger needs exactly this version
dependency 'org.apache.bval:org.apache.bval.bundle:2.0.6'
- dependency 'joda-time:joda-time:2.12.2'
+ dependency 'joda-time:joda-time:2.12.5'
- dependency 'io.github.classgraph:classgraph:4.8.154'
+ dependency 'io.github.classgraph:classgraph:4.8.157'
dependency 'org.awaitility:awaitility:4.2.0'
dependency 'com.github.spotbugs:spotbugs-annotations:4.7.3'
dependency 'javax.cache:cache-api:1.1.1'
dependency 'org.mock-server:mockserver-junit-jupiter:5.15.0'
dependency 'org.webjars:webjars-locator-core:0.52'
dependency 'com.icegreen:greenmail-junit5:1.6.14'
- dependency 'com.intuit.karate:karate-junit5:1.3.1'
+ dependency 'com.intuit.karate:karate-junit5:1.4.0'
// fineract client dependencies
dependency "com.squareup.retrofit2:retrofit:2.9.0"
@@ -156,36 +156,36 @@ dependencyManagement {
dependency "commons-codec:commons-codec:1.15"
dependency "org.projectlombok:lombok:1.18.26"
- dependency 'org.bouncycastle:bcpkix-jdk15to18:1.72'
- dependency 'org.bouncycastle:bcprov-jdk15to18:1.72'
+ dependency 'org.bouncycastle:bcpkix-jdk15to18:1.73'
+ dependency 'org.bouncycastle:bcprov-jdk15to18:1.73'
dependency 'org.bouncycastle:bcprov-jdk15on:1.70'
dependency 'org.bouncycastle:bcpg-jdk15on:1.70'
- dependency 'org.eclipse.jgit:org.eclipse.jgit:6.4.0.202211300538-r'
- dependency 'org.eclipse.jgit:org.eclipse.jgit.ssh.apache:6.4.0.202211300538-r'
+ dependency 'org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r'
+ dependency 'org.eclipse.jgit:org.eclipse.jgit.ssh.apache:6.5.0.202303070854-r'
- dependency 'org.tmatesoft.svnkit:svnkit:1.10.10'
+ dependency 'org.tmatesoft.svnkit:svnkit:1.10.11'
dependency 'com.vdurmont:semver4j:3.1.0'
dependency 'org.beryx:text-io:3.4.1'
- dependency 'org.springdoc:springdoc-openapi-ui:1.6.14'
- dependency 'org.springdoc:springdoc-openapi-webmvc-core:1.6.14'
- dependency 'org.springdoc:springdoc-openapi-common:1.6.14'
- dependency 'org.springdoc:springdoc-openapi-security:1.6.14'
- dependency 'org.springdoc:springdoc-openapi-javadoc:1.6.14'
+ dependency 'org.springdoc:springdoc-openapi-ui:1.7.0'
+ dependency 'org.springdoc:springdoc-openapi-webmvc-core:1.7.0'
+ dependency 'org.springdoc:springdoc-openapi-common:1.7.0'
+ dependency 'org.springdoc:springdoc-openapi-security:1.7.0'
+ dependency 'org.springdoc:springdoc-openapi-javadoc:1.7.0'
- dependency 'com.google.cloud.sql:mysql-socket-factory-connector-j-8:1.10.0'
+ dependency 'com.google.cloud.sql:mysql-socket-factory-connector-j-8:1.11.1'
- dependency ('org.apache.activemq:activemq-broker:5.17.4') {
+ dependency ('org.apache.activemq:activemq-broker:5.18.0') {
exclude 'javax.annotation:javax.annotation-api'
}
- dependency 'io.swagger:swagger-annotations:1.6.9'
- dependency 'io.swagger.core.v3:swagger-annotations:2.2.8'
- dependency ('io.swagger.core.v3:swagger-jaxrs2:2.2.8') {
+ dependency 'io.swagger:swagger-annotations:1.6.10'
+ dependency 'io.swagger.core.v3:swagger-annotations:2.2.9'
+ dependency ('io.swagger.core.v3:swagger-jaxrs2:2.2.9') {
exclude 'jakarta.activation:jakarta.activation-api'
}
- dependency ('io.swagger.core.v3:swagger-core:2.2.8') {
+ dependency ('io.swagger.core.v3:swagger-core:2.2.9') {
exclude 'jakarta.activation:jakarta.activation-api'
}
@@ -199,7 +199,7 @@ dependencyManagement {
exclude 'jakarta.activation:jakarta.activation-api'
}
- dependency ('org.liquibase:liquibase-core:4.19.0') {
+ dependency ('org.liquibase:liquibase-core:4.21.0') {
exclude 'javax.xml.bind:jaxb-api'
}
@@ -210,7 +210,7 @@ dependencyManagement {
exclude 'pull-parser:pull-parser'
}
- dependency 'org.owasp.esapi:esapi:2.5.1.0'
+ dependency 'org.owasp.esapi:esapi:2.5.2.0'
dependency 'org.awaitility:awaitility:4.2.0'
dependencySet(group: 'org.apache.poi', version: '5.2.3') {
@@ -237,7 +237,7 @@ dependencyManagement {
exclude 'org.slf4j:slf4j-api'
}
- dependency 'org.postgresql:postgresql:42.5.4'
+ dependency 'org.postgresql:postgresql:42.6.0'
dependency 'org.assertj:assertj-core:3.24.2'
[fineract] 02/02: Dependency fixes
Posted by ar...@apache.org.
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 <ga...@gmail.com>
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"],