Merge branch 'develop' into enhancement/loan_account_accrual_in_arrea…

…rs - 20231203
openMF · Dec 4, 2023 · a0deecf · a0deecf
2 parents e7b2229 + 8505145
commit a0deecf
Show file tree

Hide file tree

Showing 322 changed files with 16,457 additions and 2,458 deletions.
diff --git a/.github/workflows/build-mariadb.yml b/.github/workflows/build-mariadb.yml
@@ -10,15 +10,15 @@ jobs:
 
     services:
         mariad:
-            image: mariadb:11.0
+            image: mariadb:11.1
             ports:
                 - 3306:3306
             env:
                 MARIADB_ROOT_PASSWORD: mysql
             options: --health-cmd="healthcheck.sh --su-mysql --connect --innodb_initialized" --health-interval=5s --health-timeout=2s --health-retries=3
 
         mock-oauth2-server:
-          image: ghcr.io/navikt/mock-oauth2-server:2.0.0
+          image: ghcr.io/navikt/mock-oauth2-server:2.0.1
           ports:
             - 9000:9000
           env:

diff --git a/.github/workflows/build-mysql.yml b/.github/workflows/build-mysql.yml
@@ -10,15 +10,15 @@ jobs:
 
     services:
         mariad:
-            image: mysql:8.0
+            image: mysql:8.2
             ports:
                 - 3306:3306
             env:
                 MYSQL_ROOT_PASSWORD: mysql
             options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
 
         mock-oauth2-server:
-          image: ghcr.io/navikt/mock-oauth2-server:2.0.0
+          image: ghcr.io/navikt/mock-oauth2-server:2.0.1
           ports:
             - 9000:9000
           env:

diff --git a/.github/workflows/build-postgresql.yml b/.github/workflows/build-postgresql.yml
@@ -10,7 +10,7 @@ jobs:
 
     services:
         postgresql:
-            image: postgres:16.0
+            image: postgres:16.1
             ports:
                 - 5432:5432
             env:
@@ -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:2.0.0
+          image: ghcr.io/navikt/mock-oauth2-server:2.0.1
           ports:
             - 9000:9000
           env:

diff --git a/README.md b/README.md
@@ -191,7 +191,8 @@ Now to run a new Fineract instance you can simply:
 1. `git clone https://github.com/apache/fineract.git ; cd fineract`
 1. for windows, use `git clone https://github.com/apache/fineract.git --config core.autocrlf=input ; cd fineract`
 1. `./gradlew :fineract-provider:jibDockerBuild -x test`
-1. `docker-compose up -d`
+1. install the Loki log driver with `docker plugin install grafana/loki-docker-driver:latest --alias loki --grant-all-permissions`
+1. `docker compose -f docker-compose-development.yml up -d`
 1. fineract (back-end) is running at https://localhost:8443/fineract-provider/
 1. wait for https://localhost:8443/fineract-provider/actuator/health to return `{"status":"UP"}`
 1. you must go to https://localhost:8443 and remember to accept the self-signed SSL certificate of the API once in your browser, otherwise  you get a message that is rather misleading from the UI.
@@ -206,6 +207,13 @@ _(Note that in previous versions, the `mysqlserver` environment variable used at
 `docker run` time did something similar; this has changed in [FINERACT-773](https://issues.apache.org/jira/browse/FINERACT-773)),
 and the `mysqlserver` environment variable is now no longer supported.)_
 
+If you need the Java Flight Recorder image then copy the file from the running fineract-development container:
+
+```
+docker container cp fineract-development:/tmp/fineract.jfr /tmp
+```
+
+NOTE: Download Azul Mission Control from here https://www.azul.com/products/components/azul-mission-control/ to analyze the Java Flight Recorder file.
 
 Connection pool configuration
 =============================

diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@
 // TODO: this is work in progress, please follow FINERACT-1171
 buildscript {
     ext {
-        jacocoVersion = '0.8.10'
+        jacocoVersion = '0.8.11'
         retrofitVersion = '2.9.0'
         okhttpVersion = '4.9.3'
         oltuVersion = '1.0.1'
@@ -60,22 +60,22 @@ buildscript {
         classpath 'org.eclipse.persistence:eclipselink:4.0.0'
         classpath 'jakarta.ws.rs:jakarta.ws.rs-api:3.1.0'
         classpath 'com.google.cloud.tools:jib-layer-filter-extension-gradle:0.3.0'
-        classpath 'org.apache.commons:commons-lang3:3.12.0'
+        classpath 'org.apache.commons:commons-lang3:3.14.0'
         classpath 'io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.11'
         classpath 'jakarta.servlet:jakarta.servlet-api:6.0.0'
     }
 }
 
 plugins {
-    id 'me.qoomon.git-versioning' version '6.4.2'
+    id 'me.qoomon.git-versioning' version '6.4.3'
     id "org.barfuin.gradle.taskinfo" version "2.1.0"
     id 'com.adarshr.test-logger' version '4.0.0'
-    id 'com.diffplug.spotless' version '6.19.0' apply false
-    id 'org.nosphere.apache.rat' version '0.8.0' apply false
+    id 'com.diffplug.spotless' version '6.22.0' apply false
+    id 'org.nosphere.apache.rat' version '0.8.1' apply false
     id 'com.github.hierynomus.license' version '0.16.1' apply false
     id 'com.github.jk1.dependency-license-report' version '2.5' apply false
-    id 'org.zeroturnaround.gradle.jrebel' version '1.1.12' apply false
-    id 'org.springframework.boot' version '3.1.1' apply false
+    id 'org.zeroturnaround.gradle.jrebel' version '1.2.0' apply false
+    id 'org.springframework.boot' version '3.1.5' 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
@@ -85,12 +85,12 @@ 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.2' apply false
+    id 'com.google.cloud.tools.jib' version '3.4.0' apply false
     id 'org.sonarqube' version '4.4.1.3373'
-    id 'com.github.andygoossens.modernizer' version '1.8.0' apply false
+    id 'com.github.andygoossens.modernizer' version '1.9.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.1" apply false
+    id "com.github.davidmc24.gradle.plugin.avro-base" version "1.9.1" apply false
 }
 
 apply from: "${rootDir}/buildSrc/src/main/groovy/org.apache.fineract.release.gradle"
@@ -99,21 +99,23 @@ description = '''\
 Run as:
 gradle clean bootRun'''
 
-version = "0.0.0-SNAPSHOT"
+version = '0.0.0-SNAPSHOT'
+
 gitVersioning.apply {
     refs {
         considerTagsOnBranches = true
+        describeTagPattern = '.*(\\d+\\.\\d+\\.\\d+).*'
+        describeTagFirstParent = false
 
-        tag("(?<version>.*)") {
-            version = "\${ref.version}"
+        branch("\\d+\\.\\d+\\.\\d+") {
+            version = '${describe.tag.version.major}.${describe.tag.version.minor}.${describe.tag.version.patch}'
         }
-
-        branch(".+") {
-            version = "\${describe.tag.version.major}.\${describe.tag.version.minor}.\${describe.tag.version.patch.next}-SNAPSHOT"
+        branch("maintenance\\/\\d+\\.\\d+") {
+            version = '${describe.tag.version.major}.${describe.tag.version.minor}.${describe.tag.version.patch}'
         }
     }
     rev {
-        version = "\${commit}"
+        version = '${describe.tag.version.major}.${describe.tag.version.minor.next}.${describe.tag.version.patch}-SNAPSHOT'
     }
 }
 
@@ -421,7 +423,7 @@ configure(project.fineractJavaProjects) {
     // Configuration for the Checkstyle plugin
     // https://docs.gradle.org/current/userguide/checkstyle_plugin.html
     dependencies {
-        checkstyle 'com.puppycrawl.tools:checkstyle:10.12.1'
+        checkstyle 'com.puppycrawl.tools:checkstyle:10.12.5'
         checkstyle 'com.github.sevntu-checkstyle:sevntu-checks:1.44.1'
     }
 
@@ -443,7 +445,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.20.0"
+        errorprone "com.google.errorprone:error_prone_core:2.23.0"
     }
 
     tasks.withType(JavaCompile) {
@@ -693,7 +695,10 @@ configure(project.fineractCustomProjects) {
 
 configure(project.fineractPublishProjects) {
     apply plugin: 'maven-publish'
-    apply plugin: 'signing'
+
+    if (!project.hasProperty('noSign')) {
+        apply plugin: 'signing'
+    }
 
     publishing {
         publications {
@@ -747,8 +752,10 @@ configure(project.fineractPublishProjects) {
         }
     }
 
-    signing {
-        sign publishing.publications.mavenJava
+    if (!project.hasProperty('noSign')) {
+        signing {
+            sign publishing.publications.mavenJava
+        }
     }
 }
 

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -20,7 +20,7 @@
 import static org.slf4j.LoggerFactory.*
 
 plugins {
-    id 'io.spring.dependency-management' version '1.1.0'
+    id 'io.spring.dependency-management' version '1.1.4'
     id 'groovy'
     id 'java-gradle-plugin'
     id 'groovy-gradle-plugin'