apache · vidakovic · Oct 31, 2023
diff --git a/.github/workflows/build-documentation.yml b/.github/workflows/build-documentation.yml
@@ -33,4 +33,4 @@ jobs:
             sudo apt-get install ghostscript graphviz -y
 
       - name: Documentation build
-        run: ./gradlew --no-daemon --console=plain doc
+        run: ./gradlew --no-daemon --console=plain :fineract-provider:test --tests org.apache.fineract.ModularityTest doc
diff --git a/.github/workflows/build-mariadb.yml b/.github/workflows/build-mariadb.yml
@@ -82,7 +82,7 @@ jobs:
         run: |
             ./gradlew --no-daemon --console=plain build -x cucumber -x test -x doc
             ./gradlew --no-daemon --console=plain cucumber
-            ./gradlew --no-daemon --console=plain test -x :twofactor-tests:test -x :oauth2-test:test
+            ./gradlew --no-daemon --console=plain test -x :twofactor-tests:test -x :oauth2-test:test -PexcludeTests=org.apache.fineract.ModularityTest
             ./gradlew --no-daemon --console=plain :twofactor-tests:test
             ./gradlew --no-daemon --console=plain :oauth2-tests:test
 

diff --git a/.github/workflows/build-mysql.yml b/.github/workflows/build-mysql.yml
@@ -82,7 +82,7 @@ jobs:
         run: |
             ./gradlew --no-daemon --console=plain build -x cucumber -x test -x doc
             ./gradlew --no-daemon --console=plain cucumber
-            ./gradlew --no-daemon --console=plain test -x :twofactor-tests:test -x :oauth2-test:test -PdbType=mysql
+            ./gradlew --no-daemon --console=plain test -x :twofactor-tests:test -x :oauth2-test:test -PdbType=mysql -PexcludeTests=org.apache.fineract.ModularityTest
             ./gradlew --no-daemon --console=plain :twofactor-tests:test -PdbType=mysql
             ./gradlew --no-daemon --console=plain :oauth2-tests:test -PdbType=mysql
 

diff --git a/.github/workflows/build-postgresql.yml b/.github/workflows/build-postgresql.yml
@@ -83,7 +83,7 @@ jobs:
         run: |
             ./gradlew --no-daemon --console=plain build -x cucumber -x test -x doc
             ./gradlew --no-daemon --console=plain cucumber
-            ./gradlew --no-daemon --console=plain test -x :twofactor-tests:test -x :oauth2-test:test -PdbType=postgresql
+            ./gradlew --no-daemon --console=plain test -x :twofactor-tests:test -x :oauth2-test:test -PdbType=postgresql -PexcludeTests=org.apache.fineract.ModularityTest
             ./gradlew --no-daemon --console=plain :twofactor-tests:test -PdbType=postgresql
             ./gradlew --no-daemon --console=plain :oauth2-tests:test -PdbType=postgresql
 

diff --git a/build.gradle b/build.gradle
@@ -593,6 +593,9 @@ configure(project.fineractJavaProjects) {
     }
 
     test {
+        minHeapSize = "512m"
+        maxHeapSize = "1024m"
+
         useJUnitPlatform()
 
         if (project.hasProperty('excludeTests')) {

diff --git a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle
@@ -27,6 +27,7 @@ dependencyManagement {
         mavenBom 'io.micrometer:micrometer-bom:1.12.1'
         mavenBom 'org.springframework:spring-framework-bom:6.1.2'
         mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.7'
+        mavenBom 'org.springframework.modulith:spring-modulith-bom:1.1.1'
         mavenBom 'io.awspring.cloud:spring-cloud-aws-dependencies:3.0.4'
         mavenBom 'io.opentelemetry:opentelemetry-bom:1.33.0'
         mavenBom 'org.jetbrains.kotlin:kotlin-bom:1.9.22'
@@ -44,6 +45,11 @@ dependencyManagement {
         // We do not use :+ to get the latest available version available on Maven Central, as that could suddenly break things.
         // We use the Renovate Bot to automatically propose Pull Requests (PRs) when upgrades for all of these versions are available.
 
+        // NOTE: necessary, because spring-jcl has built-in version of commons-logging
+        dependency ('org.springframework:spring-core:6.1.2') {
+            exclude 'org.springframework:spring-jcl'
+        }
+
         dependency 'ch.qos.logback:logback-core:1.4.14'
         dependency 'ch.qos.logback:logback-classic:1.4.14'
         dependency 'ch.qos.logback.contrib:logback-json-classic:0.1.5'
@@ -241,5 +247,7 @@ dependencyManagement {
         dependency 'org.apache.commons:commons-math3:3.6.1'
 
         dependency 'org.mockito:mockito-inline:5.2.0'
+
+        dependency 'org.jmolecules.integrations:jmolecules-starter-ddd:0.17.0'
     }
 }
diff --git a/fineract-doc/src/docs/en/chapters/module/accounting/accrual.adoc b/fineract-doc/src/docs/en/chapters/module/accounting/accrual.adoc
@@ -0,0 +1,13 @@
+= Accrual Module
+
+WARNING: Needs more editing!
+
+== Accrual Dependencies
+
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.accounting.accrual.adoc[leveloffset=+1]
+
+.Accrual dependency diagram
+[plantuml, format=svg]
+----
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.accounting.accrual.puml[]
+----
diff --git a/fineract-doc/src/docs/en/chapters/module/accounting/closure.adoc b/fineract-doc/src/docs/en/chapters/module/accounting/closure.adoc
@@ -0,0 +1,13 @@
+= Closure Module
+
+WARNING: Needs more editing!
+
+== Closure Dependencies
+
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.accounting.closure.adoc[leveloffset=+1]
+
+.Closure dependency diagram
+[plantuml, format=svg]
+----
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.accounting.closure.puml[]
+----
diff --git a/fineract-doc/src/docs/en/chapters/module/accounting/common.adoc b/fineract-doc/src/docs/en/chapters/module/accounting/common.adoc
@@ -0,0 +1,13 @@
+= Common Module
+
+WARNING: Needs more editing!
+
+== Common Dependencies
+
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.accounting.common.adoc[leveloffset=+1]
+
+.Common dependency diagram
+[plantuml, format=svg]
+----
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.accounting.common.puml[]
+----
diff --git a/fineract-doc/src/docs/en/chapters/module/accounting/financialactivityaccount.adoc b/fineract-doc/src/docs/en/chapters/module/accounting/financialactivityaccount.adoc
@@ -0,0 +1,13 @@
+= Financialactivityaccount Module
+
+WARNING: Needs more editing!
+
+== Financialactivityaccount Dependencies
+
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.accounting.financialactivityaccount.adoc[leveloffset=+1]
+
+.Financialactivityaccount dependency diagram
+[plantuml, format=svg]
+----
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.accounting.financialactivityaccount.puml[]
+----
diff --git a/fineract-doc/src/docs/en/chapters/module/accounting/glaccount.adoc b/fineract-doc/src/docs/en/chapters/module/accounting/glaccount.adoc
@@ -0,0 +1,13 @@
+= Glaccount Module
+
+WARNING: Needs more editing!
+
+== Glaccount Dependencies
+
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.accounting.glaccount.adoc[leveloffset=+1]
+
+.Glaccount dependency diagram
+[plantuml, format=svg]
+----
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.accounting.glaccount.puml[]
+----
diff --git a/fineract-doc/src/docs/en/chapters/module/accounting/index.adoc b/fineract-doc/src/docs/en/chapters/module/accounting/index.adoc
@@ -0,0 +1,26 @@
+= Accounting Module Group
+
+WARNING: Please pick up and complete one of the section files and documet the features.
+
+// include::accrual.adoc[leveloffset=+1]
+
+// include::closure.adoc[leveloffset=+1]
+
+// include::common.adoc[leveloffset=+1]
+
+// include::financialactivityaccount.adoc[leveloffset=+1]
+
+// include::glaccount.adoc[leveloffset=+1]
+
+// include::jobs.adoc[leveloffset=+1]
+
+// include::journalentry.adoc[leveloffset=+1]
+
+// include::producttoaccountmapping.adoc[leveloffset=+1]
+
+// include::provisioning.adoc[leveloffset=+1]
+
+// include::rule.adoc[leveloffset=+1]
+
+// include::trialbalance.adoc[leveloffset=+1]
+
diff --git a/fineract-doc/src/docs/en/chapters/module/accounting/jobs.adoc b/fineract-doc/src/docs/en/chapters/module/accounting/jobs.adoc
@@ -0,0 +1,13 @@
+= Jobs Module
+
+WARNING: Needs more editing!
+
+== Jobs Dependencies
+
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.accounting.jobs.adoc[leveloffset=+1]
+
+.Jobs dependency diagram
+[plantuml, format=svg]
+----
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.accounting.jobs.puml[]
+----
diff --git a/fineract-doc/src/docs/en/chapters/module/accounting/journalentry.adoc b/fineract-doc/src/docs/en/chapters/module/accounting/journalentry.adoc
@@ -0,0 +1,13 @@
+= Journalentry Module
+
+WARNING: Needs more editing!
+
+== Journalentry Dependencies
+
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.accounting.journalentry.adoc[leveloffset=+1]
+
+.Journalentry dependency diagram
+[plantuml, format=svg]
+----
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.accounting.journalentry.puml[]
+----
diff --git a/fineract-doc/src/docs/en/chapters/module/accounting/producttoaccountmapping.adoc b/fineract-doc/src/docs/en/chapters/module/accounting/producttoaccountmapping.adoc
@@ -0,0 +1,13 @@
+= Producttoaccountmapping Module
+
+WARNING: Needs more editing!
+
+== Producttoaccountmapping Dependencies
+
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.accounting.producttoaccountmapping.adoc[leveloffset=+1]
+
+.Producttoaccountmapping dependency diagram
+[plantuml, format=svg]
+----
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.accounting.producttoaccountmapping.puml[]
+----
diff --git a/fineract-doc/src/docs/en/chapters/module/accounting/provisioning.adoc b/fineract-doc/src/docs/en/chapters/module/accounting/provisioning.adoc
@@ -0,0 +1,13 @@
+= Provisioning Module
+
+WARNING: Needs more editing!
+
+== Provisioning Dependencies
+
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.accounting.provisioning.adoc[leveloffset=+1]
+
+.Provisioning dependency diagram
+[plantuml, format=svg]
+----
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.accounting.provisioning.puml[]
+----
diff --git a/fineract-doc/src/docs/en/chapters/module/accounting/rule.adoc b/fineract-doc/src/docs/en/chapters/module/accounting/rule.adoc
@@ -0,0 +1,13 @@
+= Rule Module
+
+WARNING: Needs more editing!
+
+== Rule Dependencies
+
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.accounting.rule.adoc[leveloffset=+1]
+
+.Rule dependency diagram
+[plantuml, format=svg]
+----
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.accounting.rule.puml[]
+----
diff --git a/fineract-doc/src/docs/en/chapters/module/accounting/trialbalance.adoc b/fineract-doc/src/docs/en/chapters/module/accounting/trialbalance.adoc
@@ -0,0 +1,13 @@
+= Trialbalance Module
+
+WARNING: Needs more editing!
+
+== Trialbalance Dependencies
+
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.accounting.trialbalance.adoc[leveloffset=+1]
+
+.Trialbalance dependency diagram
+[plantuml, format=svg]
+----
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.accounting.trialbalance.puml[]
+----
diff --git a/fineract-doc/src/docs/en/chapters/module/index.adoc b/fineract-doc/src/docs/en/chapters/module/index.adoc
@@ -0,0 +1,15 @@
+= Modules
+
+WARNING: Needs more editing!
+
+include::intro.adoc[leveloffset=+1]
+
+include::top/index.adoc[leveloffset=+1]
+
+include::accounting/index.adoc[leveloffset=+1]
+
+include::infrastructure/index.adoc[leveloffset=+1]
+
+include::portfolio/index.adoc[leveloffset=+1]
+
+include::organisation/index.adoc[leveloffset=+1]
diff --git a/fineract-doc/src/docs/en/chapters/module/infrastructure/accountnumberformat.adoc b/fineract-doc/src/docs/en/chapters/module/infrastructure/accountnumberformat.adoc
@@ -0,0 +1,13 @@
+= Accountnumberformat Module
+
+WARNING: Needs more editing!
+
+== Accountnumberformat Dependencies
+
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.infrastructure.accountnumberformat.adoc[leveloffset=+1]
+
+.Accountnumberformat dependency diagram
+[plantuml, format=svg]
+----
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.infrastructure.accountnumberformat.puml[]
+----
diff --git a/fineract-doc/src/docs/en/chapters/module/infrastructure/bulkimport.adoc b/fineract-doc/src/docs/en/chapters/module/infrastructure/bulkimport.adoc
@@ -0,0 +1,13 @@
+= Bulkimport Module
+
+WARNING: Needs more editing!
+
+== Bulkimport Dependencies
+
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.infrastructure.bulkimport.adoc[leveloffset=+1]
+
+.Bulkimport dependency diagram
+[plantuml, format=svg]
+----
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.infrastructure.bulkimport.puml[]
+----
diff --git a/fineract-doc/src/docs/en/chapters/module/infrastructure/businessdate.adoc b/fineract-doc/src/docs/en/chapters/module/infrastructure/businessdate.adoc
@@ -0,0 +1,13 @@
+= Businessdate Module
+
+WARNING: Needs more editing!
+
+== Businessdate Dependencies
+
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.infrastructure.businessdate.adoc[leveloffset=+1]
+
+.Businessdate dependency diagram
+[plantuml, format=svg]
+----
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.infrastructure.businessdate.puml[]
+----
diff --git a/fineract-doc/src/docs/en/chapters/module/infrastructure/cache.adoc b/fineract-doc/src/docs/en/chapters/module/infrastructure/cache.adoc
@@ -0,0 +1,13 @@
+= Cache Module
+
+WARNING: Needs more editing!
+
+== Cache Dependencies
+
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.infrastructure.cache.adoc[leveloffset=+1]
+
+.Cache dependency diagram
+[plantuml, format=svg]
+----
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.infrastructure.cache.puml[]
+----
diff --git a/fineract-doc/src/docs/en/chapters/module/infrastructure/campaigns.adoc b/fineract-doc/src/docs/en/chapters/module/infrastructure/campaigns.adoc
@@ -0,0 +1,13 @@
+= Campaigns Module
+
+WARNING: Needs more editing!
+
+== Campaigns Dependencies
+
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.infrastructure.campaigns.adoc[leveloffset=+1]
+
+.Campaigns dependency diagram
+[plantuml, format=svg]
+----
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.infrastructure.campaigns.puml[]
+----
diff --git a/fineract-doc/src/docs/en/chapters/module/infrastructure/codes.adoc b/fineract-doc/src/docs/en/chapters/module/infrastructure/codes.adoc
@@ -0,0 +1,13 @@
+= Codes Module
+
+WARNING: Needs more editing!
+
+== Codes Dependencies
+
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.infrastructure.codes.adoc[leveloffset=+1]
+
+.Codes dependency diagram
+[plantuml, format=svg]
+----
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.infrastructure.codes.puml[]
+----
diff --git a/fineract-doc/src/docs/en/chapters/module/infrastructure/configuration.adoc b/fineract-doc/src/docs/en/chapters/module/infrastructure/configuration.adoc
@@ -0,0 +1,13 @@
+= Configuration Module
+
+WARNING: Needs more editing!
+
+== Configuration Dependencies
+
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.infrastructure.configuration.adoc[leveloffset=+1]
+
+.Configuration dependency diagram
+[plantuml, format=svg]
+----
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.infrastructure.configuration.puml[]
+----
diff --git a/fineract-doc/src/docs/en/chapters/module/infrastructure/core.adoc b/fineract-doc/src/docs/en/chapters/module/infrastructure/core.adoc
@@ -0,0 +1,13 @@
+= Core Module
+
+WARNING: Needs more editing!
+
+== Core Dependencies
+
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.infrastructure.core.adoc[leveloffset=+1]
+
+.Core dependency diagram
+[plantuml, format=svg]
+----
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.infrastructure.core.puml[]
+----
diff --git a/fineract-doc/src/docs/en/chapters/module/infrastructure/creditbureau.adoc b/fineract-doc/src/docs/en/chapters/module/infrastructure/creditbureau.adoc
@@ -0,0 +1,13 @@
+= Creditbureau Module
+
+WARNING: Needs more editing!
+
+== Creditbureau Dependencies
+
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.infrastructure.creditbureau.adoc[leveloffset=+1]
+
+.Creditbureau dependency diagram
+[plantuml, format=svg]
+----
+include::{rootdir}/fineract-provider/build/spring-modulith-docs/module-org.apache.fineract.infrastructure.creditbureau.puml[]
+----