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 2022/11/28 15:56:10 UTC
[fineract] branch develop updated (ca51084e8 -> 418675b80)
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 ca51084e8 [FINERACT-1678] Introducing `Last COB Business Date` for loans
new 6e7e4221b fix(deps): update non-major
new 418675b80 Making duplicate classpath scanning test result more understandable and a few reorganizations for MariaDB and PostgreSQL deps
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:
build.gradle | 4 ++--
.../groovy/org.apache.fineract.dependencies.gradle | 7 +++++++
custom/docker/build.gradle | 4 ++--
fineract-provider/build.gradle | 12 ++++++------
.../classpath/ClasspathDuplicatesStepDefinitions.java | 19 ++++++++++++++-----
instancemode-tests/dependencies.gradle | 2 +-
integration-tests/dependencies.gradle | 2 +-
oauth2-tests/dependencies.gradle | 2 +-
twofactor-tests/dependencies.gradle | 2 +-
9 files changed, 35 insertions(+), 19 deletions(-)
[fineract] 02/02: Making duplicate classpath scanning test result more understandable and a few reorganizations for MariaDB and PostgreSQL deps
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 418675b800577c494c189a84b41f23b8825046c6
Author: Arnold Galovics <ga...@gmail.com>
AuthorDate: Mon Nov 28 13:21:31 2022 +0100
Making duplicate classpath scanning test result more understandable and a few reorganizations for MariaDB and PostgreSQL deps
---
.../groovy/org.apache.fineract.dependencies.gradle | 7 +++++++
custom/docker/build.gradle | 4 ++--
fineract-provider/build.gradle | 12 ++++++------
.../classpath/ClasspathDuplicatesStepDefinitions.java | 19 ++++++++++++++-----
4 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle
index f91a1e7ad..5eff726ef 100644
--- a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle
+++ b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle
@@ -221,5 +221,12 @@ dependencyManagement {
dependency "org.apache.avro:avro:1.11.1"
dependency "io.github.resilience4j:resilience4j-spring-boot2:1.7.1"
+
+ dependency ('org.mariadb.jdbc:mariadb-java-client:3.1.0') {
+ exclude 'org.slf4j:jcl-over-slf4j'
+ exclude 'org.slf4j:slf4j-api'
+ }
+
+ dependency 'org.postgresql:postgresql:42.5.1'
}
}
diff --git a/custom/docker/build.gradle b/custom/docker/build.gradle
index 8d9cfd203..45e29df3f 100644
--- a/custom/docker/build.gradle
+++ b/custom/docker/build.gradle
@@ -84,9 +84,9 @@ jib {
}
}
// NOTE: other custom dependencies
- implementation 'org.mariadb.jdbc:mariadb-java-client:3.1.0'
+ implementation 'org.mariadb.jdbc:mariadb-java-client'
implementation 'mysql:mysql-connector-java:8.0.31'
- implementation 'org.postgresql:postgresql:42.5.1'
+ implementation 'org.postgresql:postgresql'
annotationProcessor('org.springframework.boot:spring-boot-autoconfigure-processor')
annotationProcessor('org.springframework.boot:spring-boot-configuration-processor')
}
diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index 321861162..bbfadc139 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -150,8 +150,8 @@ configurations {
driver
}
dependencies {
- driver 'org.mariadb.jdbc:mariadb-java-client:3.1.0'
- driver 'org.postgresql:postgresql:42.5.1'
+ driver 'org.mariadb.jdbc:mariadb-java-client'
+ driver 'org.postgresql:postgresql'
driver 'mysql:mysql-connector-java:8.0.31'
}
@@ -222,8 +222,8 @@ bootRun {
]
dependencies {
- implementation 'org.mariadb.jdbc:mariadb-java-client:3.1.0'
- implementation 'org.postgresql:postgresql:42.5.1'
+ implementation 'org.mariadb.jdbc:mariadb-java-client'
+ implementation 'org.postgresql:postgresql'
}
}
@@ -286,8 +286,8 @@ jib {
allowInsecureRegistries = true
dependencies {
- implementation 'org.mariadb.jdbc:mariadb-java-client:3.1.0'
- implementation 'org.postgresql:postgresql:42.5.1'
+ implementation 'org.mariadb.jdbc:mariadb-java-client'
+ implementation 'org.postgresql:postgresql'
}
pluginExtensions {
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 39e72fe41..617ae1a21 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
@@ -22,10 +22,14 @@ import io.cucumber.java8.En;
import io.github.classgraph.ClassGraph;
import io.github.classgraph.ResourceList;
import io.github.classgraph.ScanResult;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import org.apache.commons.collections4.MapUtils;
import org.opentest4j.AssertionFailedError;
public class ClasspathDuplicatesStepDefinitions implements En {
@@ -69,7 +73,11 @@ public class ClasspathDuplicatesStepDefinitions implements En {
// tag::then[]
Then("There should be no duplicates", () -> {
if (!duplicates.isEmpty()) {
- throw new AssertionFailedError(duplicates.size() + " Classpath duplicates detected:\n" + duplicates);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ PrintStream ps = new PrintStream(baos, false, StandardCharsets.UTF_8);
+ MapUtils.debugPrint(ps, "duplicates", duplicates);
+ String prettyPrintedMap = baos.toString(StandardCharsets.UTF_8);
+ throw new AssertionFailedError(duplicates.size() + " Classpath duplicates detected:\n" + prettyPrintedMap);
}
});
// end::then[]
@@ -89,10 +97,11 @@ public class ClasspathDuplicatesStepDefinitions implements En {
// list formerly in ClasspathHellDuplicatesCheckRule (moved here
// in INFRAUTILS-52)
|| resourcePath.endsWith(".txt") || resourcePath.endsWith("LICENSE") || resourcePath.endsWith("license.html")
- || resourcePath.endsWith("about.html") || resourcePath.endsWith("readme.html")
- || resourcePath.startsWith("META-INF/services") || resourcePath.equals("META-INF/DEPENDENCIES")
- || resourcePath.equals("META-INF/git.properties") || resourcePath.equals("META-INF/io.netty.versions.properties")
- || resourcePath.equals("META-INF/jersey-module-version") || resourcePath.startsWith("OSGI-INF/blueprint/")
+ || resourcePath.endsWith("AL2.0") || resourcePath.endsWith("LGPL2.1") || resourcePath.endsWith("about.html")
+ || resourcePath.endsWith("readme.html") || resourcePath.startsWith("META-INF/services")
+ || resourcePath.equals("META-INF/DEPENDENCIES") || resourcePath.equals("META-INF/git.properties")
+ || resourcePath.equals("META-INF/io.netty.versions.properties") || resourcePath.equals("META-INF/jersey-module-version")
+ || resourcePath.startsWith("OSGI-INF/blueprint/")
// in Akka's JARs
|| resourcePath.startsWith("org/opendaylight/blueprint/") || resourcePath.endsWith("reference.conf")
// json-schema-core and json-schema-validator depend on each
[fineract] 01/02: fix(deps): update non-major
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 6e7e4221ba36e8b9aaf6176a4638946fb967993b
Author: Renovate <bo...@renovateapp.com>
AuthorDate: Mon Nov 28 02:02:55 2022 +0000
fix(deps): update non-major
---
build.gradle | 4 ++--
custom/docker/build.gradle | 4 ++--
fineract-provider/build.gradle | 12 ++++++------
instancemode-tests/dependencies.gradle | 2 +-
integration-tests/dependencies.gradle | 2 +-
oauth2-tests/dependencies.gradle | 2 +-
twofactor-tests/dependencies.gradle | 2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/build.gradle b/build.gradle
index 56c92a31f..870e64dc4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -396,8 +396,8 @@ configure(project.fineractJavaProjects) {
// Configuration for the Checkstyle plugin
// https://docs.gradle.org/current/userguide/checkstyle_plugin.html
dependencies {
- checkstyle 'com.puppycrawl.tools:checkstyle:10.4'
- checkstyle 'com.github.sevntu-checkstyle:sevntu-checks:1.42.0'
+ checkstyle 'com.puppycrawl.tools:checkstyle:10.5.0'
+ checkstyle 'com.github.sevntu-checkstyle:sevntu-checks:1.43.0'
}
// Configuration for JaCoCo code coverage task
diff --git a/custom/docker/build.gradle b/custom/docker/build.gradle
index 64d38c2e6..8d9cfd203 100644
--- a/custom/docker/build.gradle
+++ b/custom/docker/build.gradle
@@ -84,9 +84,9 @@ jib {
}
}
// NOTE: other custom dependencies
- implementation 'org.mariadb.jdbc:mariadb-java-client:3.0.9'
+ implementation 'org.mariadb.jdbc:mariadb-java-client:3.1.0'
implementation 'mysql:mysql-connector-java:8.0.31'
- implementation 'org.postgresql:postgresql:42.5.0'
+ implementation 'org.postgresql:postgresql:42.5.1'
annotationProcessor('org.springframework.boot:spring-boot-autoconfigure-processor')
annotationProcessor('org.springframework.boot:spring-boot-configuration-processor')
}
diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index 1089ec8e5..321861162 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -150,8 +150,8 @@ configurations {
driver
}
dependencies {
- driver 'org.mariadb.jdbc:mariadb-java-client:3.0.9'
- driver 'org.postgresql:postgresql:42.5.0'
+ driver 'org.mariadb.jdbc:mariadb-java-client:3.1.0'
+ driver 'org.postgresql:postgresql:42.5.1'
driver 'mysql:mysql-connector-java:8.0.31'
}
@@ -222,8 +222,8 @@ bootRun {
]
dependencies {
- implementation 'org.mariadb.jdbc:mariadb-java-client:3.0.9'
- implementation 'org.postgresql:postgresql:42.5.0'
+ implementation 'org.mariadb.jdbc:mariadb-java-client:3.1.0'
+ implementation 'org.postgresql:postgresql:42.5.1'
}
}
@@ -286,8 +286,8 @@ jib {
allowInsecureRegistries = true
dependencies {
- implementation 'org.mariadb.jdbc:mariadb-java-client:3.0.9'
- implementation 'org.postgresql:postgresql:42.5.0'
+ implementation 'org.mariadb.jdbc:mariadb-java-client:3.1.0'
+ implementation 'org.postgresql:postgresql:42.5.1'
}
pluginExtensions {
diff --git a/instancemode-tests/dependencies.gradle b/instancemode-tests/dependencies.gradle
index 789685b25..7cff69752 100644
--- a/instancemode-tests/dependencies.gradle
+++ b/instancemode-tests/dependencies.gradle
@@ -20,7 +20,7 @@ dependencies {
// testCompile dependencies are ONLY used in src/test, not src/main.
// Do NOT repeat dependencies which are ALREADY in implementation or runtimeOnly!
//
- tomcat 'org.apache.tomcat:tomcat:9.0.68@zip'
+ tomcat 'org.apache.tomcat:tomcat:9.0.69@zip'
testImplementation( files("$rootDir/fineract-provider/build/classes/java/main/"),
project(path: ':fineract-provider', configuration: 'runtimeElements'),
'io.cucumber:cucumber-spring',
diff --git a/integration-tests/dependencies.gradle b/integration-tests/dependencies.gradle
index 69569b6b2..85c597a8e 100644
--- a/integration-tests/dependencies.gradle
+++ b/integration-tests/dependencies.gradle
@@ -20,7 +20,7 @@ dependencies {
// testCompile dependencies are ONLY used in src/test, not src/main.
// Do NOT repeat dependencies which are ALREADY in implementation or runtimeOnly!
//
- tomcat 'org.apache.tomcat:tomcat:9.0.68@zip'
+ tomcat 'org.apache.tomcat:tomcat:9.0.69@zip'
testImplementation( files("$rootDir/fineract-provider/build/classes/java/main/"),
project(path: ':fineract-provider', configuration: 'runtimeElements'),
project(path: ':fineract-avro-schemas', configuration: 'runtimeElements'),
diff --git a/oauth2-tests/dependencies.gradle b/oauth2-tests/dependencies.gradle
index c5629a57a..b886631c3 100644
--- a/oauth2-tests/dependencies.gradle
+++ b/oauth2-tests/dependencies.gradle
@@ -20,7 +20,7 @@ dependencies {
// testCompile dependencies are ONLY used in src/test, not src/main.
// Do NOT repeat dependencies which are ALREADY in implementation or runtimeOnly!
//
- tomcat 'org.apache.tomcat:tomcat:9.0.68@zip'
+ tomcat 'org.apache.tomcat:tomcat:9.0.69@zip'
testImplementation( files("$rootDir/fineract-provider/build/classes/java/main/"),
project(path: ':fineract-provider', configuration: 'runtimeElements'),
'org.junit.jupiter:junit-jupiter-api',
diff --git a/twofactor-tests/dependencies.gradle b/twofactor-tests/dependencies.gradle
index 369e68d64..b51fcbe13 100644
--- a/twofactor-tests/dependencies.gradle
+++ b/twofactor-tests/dependencies.gradle
@@ -20,7 +20,7 @@ dependencies {
// testCompile dependencies are ONLY used in src/test, not src/main.
// Do NOT repeat dependencies which are ALREADY in implementation or runtimeOnly!
//
- tomcat 'org.apache.tomcat:tomcat:9.0.68@zip'
+ tomcat 'org.apache.tomcat:tomcat:9.0.69@zip'
testImplementation( files("$rootDir/fineract-provider/build/classes/java/main/"),
project(path: ':fineract-provider', configuration: 'runtimeElements'),
'org.junit.jupiter:junit-jupiter-api',