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/06/08 12:42:25 UTC
[fineract] branch develop updated (14a78412b -> c1a8fe867)
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 14a78412b FINERACT-1926 improve integration test readability
new 0323f62ed Update all non-major dependencies
new b5c85f1ac Added classpath exclusion on doubleparser package in jackson
new c1a8fe867 Switched generating fineract-client from YAML to JSON to avoid SnakeYAML random dependency issues
The 3 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-postgresql.yml | 2 +-
build.gradle | 14 ++---
.../groovy/org.apache.fineract.dependencies.gradle | 64 +++++++++++-----------
docker-compose-postgresql.yml | 2 +-
fineract-client/build.gradle | 2 +-
.../ClasspathDuplicatesStepDefinitions.java | 2 +-
settings.gradle | 4 +-
7 files changed, 45 insertions(+), 45 deletions(-)
[fineract] 01/03: 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 0323f62edf581d2341414592da9a89d4b81352eb
Author: Renovate <bo...@renovateapp.com>
AuthorDate: Wed Jun 7 22:11:42 2023 +0000
Update all non-major dependencies
---
.github/workflows/build-postgresql.yml | 2 +-
build.gradle | 12 ++--
.../groovy/org.apache.fineract.dependencies.gradle | 64 +++++++++++-----------
docker-compose-postgresql.yml | 2 +-
settings.gradle | 4 +-
5 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/.github/workflows/build-postgresql.yml b/.github/workflows/build-postgresql.yml
index 25999790b..21dec01ed 100644
--- a/.github/workflows/build-postgresql.yml
+++ b/.github/workflows/build-postgresql.yml
@@ -10,7 +10,7 @@ jobs:
services:
postgresql:
- image: postgres:15.2
+ image: postgres:15.3
ports:
- 5432:5432
env:
diff --git a/build.gradle b/build.gradle
index 209878230..45e8dba69 100644
--- a/build.gradle
+++ b/build.gradle
@@ -70,11 +70,11 @@ plugins {
id 'com.diffplug.spotless' version '6.19.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 'com.github.jk1.dependency-license-report' version '2.4' apply false
id 'org.zeroturnaround.gradle.jrebel' version '1.1.12' apply false
id 'org.springframework.boot' version '3.1.0' apply false
- id 'net.ltgt.errorprone' version '3.0.1' apply false
- id 'io.swagger.core.v3.swagger-gradle-plugin' version '2.2.9' apply false
+ id 'net.ltgt.errorprone' version '3.1.0' apply false
+ id 'io.swagger.core.v3.swagger-gradle-plugin' version '2.2.11' 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
@@ -82,13 +82,13 @@ plugins {
id 'org.asciidoctor.jvm.revealjs' version '3.3.2' apply false
id 'org.asciidoctor.jvm.gems' version '3.3.2' apply false
id 'org.asciidoctor.kindlegen.base' version '3.2.0' apply false
- id 'com.google.cloud.tools.jib' version '3.3.1' apply false
+ id 'com.google.cloud.tools.jib' version '3.3.2' apply false
id 'fr.brouillard.oss.gradle.jgitver' version '0.10.0-rc03'
- id 'org.sonarqube' version '4.0.0.2929'
+ id 'org.sonarqube' version '4.2.0.3129'
id 'com.github.andygoossens.modernizer' version '1.8.0' 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.7.0" apply false
+ id "com.github.davidmc24.gradle.plugin.avro-base" version "1.7.1" 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 f754958ac..c19ffb842 100644
--- a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle
+++ b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle
@@ -24,13 +24,13 @@ dependencyManagement {
imports {
mavenBom 'org.springframework:spring-framework-bom:6.0.9'
mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.0'
- 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.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.47'
+ mavenBom 'org.jetbrains.kotlin:kotlin-bom:1.8.22'
+ mavenBom 'org.junit:junit-bom:5.9.3'
+ mavenBom 'com.fasterxml.jackson:jackson-bom:2.15.2'
+ mavenBom 'io.cucumber:cucumber-bom:7.12.1'
+ mavenBom 'io.netty:netty-bom:4.1.93.Final'
+ mavenBom 'org.mockito:mockito-bom:5.3.1'
+ mavenBom 'software.amazon.awssdk:bom:2.20.81'
}
dependencies {
@@ -53,14 +53,14 @@ dependencyManagement {
dependency 'org.eclipse.persistence:org.eclipse.persistence.jpa:4.0.0'
dependency 'com.google.guava:guava:32.0.0-jre'
dependency 'com.google.code.gson:gson:2.10.1'
- dependency 'com.google.truth:truth:1.1.3'
- dependency 'com.google.truth.extensions:truth-java8-extension:1.1.3'
- dependency 'com.google.googlejavaformat:google-java-format:1.16.0'
+ dependency 'com.google.truth:truth:1.1.4'
+ dependency 'com.google.truth.extensions:truth-java8-extension:1.1.4'
+ dependency 'com.google.googlejavaformat:google-java-format:1.17.0'
dependency ('org.apache.commons:commons-email:1.5') {
exclude 'com.sun.mail:javax.mail'
exclude 'javax.activation:activation'
}
- dependency 'commons-io:commons-io:2.11.0'
+ dependency 'commons-io:commons-io:2.13.0'
dependency 'com.github.librepdf:openpdf:1.3.30'
dependency ('org.mnode.ical4j:ical4j:3.2.11') {
exclude 'com.sun.mail:javax.mail'
@@ -68,12 +68,12 @@ dependencyManagement {
}
dependency 'org.apache.commons:commons-csv:1.10.0'
dependency 'org.quartz-scheduler:quartz:2.3.2'
- dependency 'software.amazon.awssdk:bom:2.20.47'
+ dependency 'software.amazon.awssdk:bom:2.20.81'
dependency 'org.ehcache:ehcache:3.10.8'
dependency 'com.github.spullara.mustache.java:compiler:0.9.10'
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') {
+ dependency 'org.apache.tika:tika-core:2.8.0'
+ dependency ('org.apache.tika:tika-parser-microsoft-module:2.8.0') {
exclude 'org.bouncycastle:bcprov-jdk15on'
exclude 'org.bouncycastle:bcmail-jdk15on'
exclude 'org.bouncycastle:bcprov-jdk18on'
@@ -92,7 +92,7 @@ dependencyManagement {
exclude 'org.apache.commons:commons-compress'
exclude 'xml-apis:xml-apis'
}
- dependency ('org.apache.tika:tika-parser-miscoffice-module:2.7.0') {
+ dependency ('org.apache.tika:tika-parser-miscoffice-module:2.8.0') {
exclude 'org.bouncycastle:bcprov-jdk15on'
exclude 'org.bouncycastle:bcmail-jdk15on'
exclude 'org.bouncycastle:bcprov-jdk18on'
@@ -121,7 +121,7 @@ dependencyManagement {
dependency 'org.apache.bval:org.apache.bval.bundle:2.0.6'
dependency 'joda-time:joda-time:2.12.5'
- dependency 'io.github.classgraph:classgraph:4.8.157'
+ dependency 'io.github.classgraph:classgraph:4.8.160'
dependency 'org.awaitility:awaitility:4.2.0'
dependency 'com.github.spotbugs:spotbugs-annotations:4.7.3'
dependency 'javax.cache:cache-api:1.1.1'
@@ -148,17 +148,17 @@ dependencyManagement {
dependency "org.apache.oltu.oauth2:org.apache.oltu.oauth2.common:1.0.1"
dependency "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:1.0.1"
dependency "org.apache.oltu.oauth2:org.apache.oltu.oauth2.httpclient4:1.0.1"
- dependency "com.squareup.okhttp3:okhttp:4.10.0"
- dependency "com.squareup.okhttp3:okcurl:4.10.0"
- dependency "com.squareup.okhttp3:logging-interceptor:4.10.0"
+ dependency "com.squareup.okhttp3:okhttp:4.11.0"
+ dependency "com.squareup.okhttp3:okcurl:4.11.0"
+ dependency "com.squareup.okhttp3:logging-interceptor:4.11.0"
dependency "com.squareup.okhttp3:okhttp-apache:4.9.3"
dependency "com.squareup.okhttp3:okhttp-android-support:4.9.3"
- dependency "com.squareup.okhttp3:okhttp-urlconnection:4.10.0"
- dependency "com.squareup.okhttp3:okhttp-sse:4.10.0"
+ dependency "com.squareup.okhttp3:okhttp-urlconnection:4.11.0"
+ dependency "com.squareup.okhttp3:okhttp-sse:4.11.0"
dependency "io.gsonfire:gson-fire:1.8.5"
dependency "com.google.code.findbugs:jsr305:3.0.2"
dependency "commons-codec:commons-codec:1.15"
- dependency "org.projectlombok:lombok:1.18.26"
+ dependency "org.projectlombok:lombok:1.18.28"
dependency 'org.bouncycastle:bcpkix-jdk15to18:1.73'
dependency 'org.bouncycastle:bcprov-jdk15to18:1.73'
@@ -176,17 +176,17 @@ dependencyManagement {
exclude 'io.swagger.core.v3:swagger-core'
}
- dependency 'com.google.cloud.sql:mysql-socket-factory-connector-j-8:1.11.1'
+ dependency 'com.google.cloud.sql:mysql-socket-factory-connector-j-8:1.11.2'
dependency ('org.apache.activemq:activemq-client-jakarta:5.18.1') {
exclude 'javax.annotation:javax.annotation-api'
}
- dependency 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.9'
- dependency ('io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.9') {
+ dependency 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.11'
+ dependency ('io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.11') {
exclude 'jakarta.activation:jakarta.activation-api'
}
- dependency ('io.swagger.core.v3:swagger-core-jakarta:2.2.9') {
+ dependency ('io.swagger.core.v3:swagger-core-jakarta:2.2.11') {
exclude 'jakarta.activation:jakarta.activation-api'
}
@@ -200,7 +200,7 @@ dependencyManagement {
exclude 'jakarta.activation:jakarta.activation-api'
}
- dependency ('org.liquibase:liquibase-core:4.21.1') {
+ dependency ('org.liquibase:liquibase-core:4.22.0') {
exclude 'javax.xml.bind:jaxb-api'
}
@@ -225,17 +225,17 @@ dependencyManagement {
entry 'json-path'
entry 'xml-path'
}
- dependency 'org.apache.groovy:groovy-xml:4.0.6'
- dependency 'org.apache.groovy:groovy-json:4.0.6'
+ dependency 'org.apache.groovy:groovy-xml:4.0.12'
+ dependency 'org.apache.groovy:groovy-json:4.0.12'
- dependency 'org.mapstruct:mapstruct:1.5.4.Final'
- dependency 'org.mapstruct:mapstruct-processor:1.5.4.Final'
+ dependency 'org.mapstruct:mapstruct:1.5.5.Final'
+ dependency 'org.mapstruct:mapstruct-processor:1.5.5.Final'
dependency "org.apache.avro:avro:1.11.1"
dependency "io.github.resilience4j:resilience4j-spring-boot2:2.0.2"
- dependency ('org.mariadb.jdbc:mariadb-java-client:3.0.9') {
+ dependency ('org.mariadb.jdbc:mariadb-java-client:3.1.4') {
exclude 'org.slf4j:jcl-over-slf4j'
exclude 'org.slf4j:slf4j-api'
}
diff --git a/docker-compose-postgresql.yml b/docker-compose-postgresql.yml
index 2dd764f2a..327046fc8 100644
--- a/docker-compose-postgresql.yml
+++ b/docker-compose-postgresql.yml
@@ -21,7 +21,7 @@ version: '3.7'
services:
# Backend service
fineractpostgresql:
- image: postgres:15.2
+ image: postgres:15.3
volumes:
- ./fineract-db/docker/postgresql:/docker-entrypoint-initdb.d/:Z,ro
restart: always
diff --git a/settings.gradle b/settings.gradle
index 9ffbe4fd1..5cb328fd4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -18,8 +18,8 @@
*/
plugins {
- id 'com.gradle.enterprise' version '3.12.5'
- id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.10'
+ id 'com.gradle.enterprise' version '3.13.3'
+ id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.11'
}
def isCI = System.getenv('JENKINS_URL') != null
[fineract] 03/03: Switched generating fineract-client from YAML to JSON to avoid SnakeYAML random dependency issues
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 c1a8fe867bc47f55cb645e620c728dc26ece6f12
Author: Arnold Galovics <ga...@gmail.com>
AuthorDate: Thu Jun 8 12:52:35 2023 +0200
Switched generating fineract-client from YAML to JSON to avoid SnakeYAML random dependency issues
---
build.gradle | 2 +-
fineract-client/build.gradle | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index 45e8dba69..983de0f88 100644
--- a/build.gradle
+++ b/build.gradle
@@ -98,7 +98,7 @@ Run as:
gradle clean bootRun'''
ext['groovy.version'] = '4.0.6'
-ext['swaggerFile'] = "$rootDir/fineract-provider/build/classes/java/main/static/fineract.yaml".toString()
+ext['swaggerFile'] = "$rootDir/fineract-provider/build/classes/java/main/static/fineract.json".toString()
allprojects {
group = 'org.apache.fineract'
diff --git a/fineract-client/build.gradle b/fineract-client/build.gradle
index 4884d2494..6725202e7 100644
--- a/fineract-client/build.gradle
+++ b/fineract-client/build.gradle
@@ -32,7 +32,7 @@ openApiMeta {
generatorName = 'Fineract'
packageName = 'org.apache.fineract.client'
outputFolder = "$buildDir/meta".toString()
- // trick to make sure fineract.yaml is generated first
+ // trick to make sure fineract.json is generated first
}
openApiValidate {
[fineract] 02/03: Added classpath exclusion on doubleparser package in jackson
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 b5c85f1ac3c1c9f6f9777480d47a46168a87d8f5
Author: Arnold Galovics <ga...@gmail.com>
AuthorDate: Thu Jun 8 11:57:09 2023 +0200
Added classpath exclusion on doubleparser package in jackson
---
.../infrastructure/classpath/ClasspathDuplicatesStepDefinitions.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 1f071f760..568e784bb 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
@@ -122,7 +122,7 @@ public class ClasspathDuplicatesStepDefinitions implements En {
|| resourcePath.equals("META-INF/validation-configuration-3.0.xsd")
// Spring Framework knows what they are do..
|| resourcePath.startsWith("META-INF/spring") || resourcePath.startsWith("META-INF/additional-spring")
- || resourcePath.startsWith("META-INF/terracotta")
+ || resourcePath.startsWith("META-INF/terracotta") || resourcePath.startsWith("com/fasterxml/jackson/core/io/doubleparser")
// Groovy is groovy
|| resourcePath.startsWith("META-INF/groovy")
// Something doesn't to be a perfectly clean in Maven Surefire: