FINERACT-1526: Upgrade dependencies

.github/workflows/build.yml

@@ -7,7 +7,7 @@ jobs:
 
     services:
         mariad:
-            image: mariadb:10.6
+            image: mariadb:10.8
             ports:
                 - 3306:3306
             env:

README.md

@@ -25,11 +25,11 @@ Requirements
 
 You can run the required version of the database server in a container, instead of having to install it, like this:
 
-    docker run --name mariadb-10.6 -p 3306:3306 -e MARIADB_ROOT_PASSWORD=mysql -d mariadb:10.6
+    docker run --name mariadb-10.8 -p 3306:3306 -e MARIADB_ROOT_PASSWORD=mysql -d mariadb:10.8
 
 and stop and destroy it like this:
 
-    docker rm -f mariadb-10.6
+    docker rm -f mariadb-10.8
 
 Beware that this database container database keeps its state inside the container and not on the host filesystem.  It is lost when you destroy (rm) this container.  This is typically fine for development.  See [Caveats: Where to Store Data on the database container documentation](https://hub.docker.com/_/mariadb) re. how to make it persistent instead of ephemeral.
 
@@ -49,9 +49,11 @@ Instructions to build the JAR file
 ============
 1. Clone the repository or download and extract the archive file to your local directory.
 2. Run `./gradlew clean bootJar` to build a modern cloud native fully self contained JAR file which will be created at `fineract-provider/build/libs` directory.
-3. As we are not allowed to include a JDBC driver in the built JAR, download a JDBC driver of your choice. For example: `wget https://downloads.mariadb.com/Connectors/java/connector-java-2.7.3/mariadb-java-client-2.7.3.jar`
+3. As we are not allowed to include a JDBC driver in the built JAR, download a JDBC driver of your choice. For example: `wget https://downloads.mariadb.com/Connectors/java/connector-java-2.7.5/mariadb-java-client-2.7.5.jar`
 4. Start the jar and pass the directory where you have downloaded the JDBC driver as loader.path, for example: `java -Dloader.path=. -jar fineract-provider/build/libs/fineract-provider.jar` (does not require external Tomcat)
 
+NOTE: we cannot upgrade to version 3.0.x of the MariaDB driver just yet; have to wait until 3.0.4 is out for a bug fix.
+
 The tenants database connection details are configured [via environment variables (as with Docker container)](#instructions-to-run-using-docker-and-docker-compose), e.g. like this:
 
     export FINERACT_HIKARI_PASSWORD=verysecret

build.gradle

@@ -113,6 +113,7 @@ allprojects  {
             mavenBom 'org.springframework:spring-framework-bom:5.3.16'
             mavenBom 'org.springframework.boot:spring-boot-dependencies:2.6.4'
             mavenBom 'org.junit:junit-bom:5.8.2'
+            mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.2'
         }
 
         dependencies {
@@ -128,10 +129,10 @@ allprojects  {
             dependency 'org.apache.commons:commons-email:1.5'
             dependency 'commons-io:commons-io:2.11.0'
             dependency 'com.github.librepdf:openpdf:1.3.27'
-            dependency 'org.mnode.ical4j:ical4j:3.1.3'
+            dependency 'org.mnode.ical4j:ical4j:3.2.1'
             dependency 'org.quartz-scheduler:quartz:2.3.2'
-            dependency 'com.amazonaws:aws-java-sdk-s3:1.12.175'
-            dependency 'org.ehcache:ehcache:3.9.9'
+            dependency 'com.amazonaws:aws-java-sdk-s3:1.12.176'
+            dependency 'org.ehcache:ehcache:3.10.0'
             dependency 'com.github.spullara.mustache.java:compiler:0.9.10'
             dependency 'com.jayway.jsonpath:json-path:2.7.0'
             dependency 'org.apache.tika:tika-core:2.3.0'
@@ -139,8 +140,8 @@ allprojects  {
             dependency 'io.swagger.core.v3:swagger-annotations:2.1.13'
             dependency 'jakarta.management.j2ee:jakarta.management.j2ee-api:1.1.4'
             dependency 'jakarta.jms:jakarta.jms-api:2.0.3'
-            dependency 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.3'
-            dependency 'org.glassfish.jaxb:jaxb-runtime:2.3.6'
+            dependency 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.3' // Swagger needs exactly this version
+            dependency 'org.glassfish.jaxb:jaxb-runtime:2.3.6' // Swagger needs exactly this version
             dependency 'org.apache.activemq:activemq-broker:5.16.4'
             dependency 'org.apache.bval:org.apache.bval.bundle:2.0.5'
 
@@ -148,7 +149,7 @@ allprojects  {
             dependency 'org.awaitility:awaitility:4.2.0'
             dependency 'com.github.spotbugs:spotbugs-annotations:4.6.0'
             dependency 'javax.cache:cache-api:1.1.1'
-            dependency 'org.mock-server:mockserver-junit-jupiter:5.11.2'
+            dependency 'org.mock-server:mockserver-junit-jupiter:5.12.0'
             dependency 'org.webjars.npm:swagger-ui-dist:4.6.2'
             dependency 'org.webjars:webjars-locator-core:0.50'
             dependency 'com.icegreen:greenmail-junit5:1.6.7'
@@ -184,6 +185,8 @@ allprojects  {
             dependency "javax.annotation:javax.annotation-api:1.3.2"
             dependency "com.google.code.findbugs:jsr305:3.0.2"
             dependency "commons-codec:commons-codec:1.15"
+            dependency "org.bouncycastle:bcpkix-jdk15on:1.70"
+            dependency "org.bouncycastle:bcprov-jdk15on:1.70"
 
             dependency ('org.liquibase:liquibase-core:4.8.0') {
                 exclude 'javax.xml.bind:jaxb-api'
@@ -489,7 +492,7 @@ configure(project.fineractJavaProjects) {
     // Configuration for the Checkstyle plugin
     // https://docs.gradle.org/current/userguide/checkstyle_plugin.html
     dependencies {
-        checkstyle 'com.puppycrawl.tools:checkstyle:9.3'
+        checkstyle 'com.puppycrawl.tools:checkstyle:10.0'
         checkstyle 'com.github.sevntu-checkstyle:sevntu-checks:1.41.0'
     }
 
@@ -511,7 +514,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.10.0"
+        errorprone "com.google.errorprone:error_prone_core:2.11.0"
     }
 
     tasks.withType(JavaCompile) {
@@ -573,7 +576,6 @@ configure(project.fineractJavaProjects) {
                     "UnsafeFinalization",
                     "JavaTimeDefaultTimeZone",
                     "JodaPlusMinusLong",
-                    "MutableMethodReturnType",
                     "SwitchDefault",
                     "VarTypeName",
                     "ArgumentSelectionDefectChecker",

docker-compose-community-app.yml

@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+version: '3.7'
+services:
+  # Frontend service
+  community-app:
+    image: openmf/community-app:latest
+    container_name: mifos-ui
+    restart: always
+    ports:
+      - 9090:80

docker-compose-postgresql.yml

@@ -94,14 +94,3 @@ services:
       - FINERACT_DEFAULT_TENANTDB_IDENTIFIER=default
       - FINERACT_DEFAULT_TENANTDB_NAME=fineract_default
       - FINERACT_DEFAULT_TENANTDB_DESCRIPTION=Default Demo Tenant
-
-  # Frontend service
-  community-app:
-    image: openmf/community-app:latest
-    container_name: mifos-ui
-    restart: always
-    ports:
-      - 9090:80
-    depends_on:
-      fineract-server:
-        condition: service_healthy

docker-compose.yml

@@ -90,14 +90,3 @@ services:
       - FINERACT_DEFAULT_TENANTDB_IDENTIFIER=default
       - FINERACT_DEFAULT_TENANTDB_NAME=fineract_default
       - FINERACT_DEFAULT_TENANTDB_DESCRIPTION=Default Demo Tenant
-
-  # Frontend service
-  community-app:
-    image: openmf/community-app:latest
-    container_name: mifos-ui
-    restart: always
-    ports:
-      - 9090:80
-    depends_on:
-      fineract-server:
-        condition: service_healthy

fineract-provider/build.gradle

@@ -66,7 +66,7 @@ resolve {
     logging.captureStandardOutput LogLevel.INFO
     outputFileName = 'fineract'
     outputFormat = 'YAML'
-    prettyPrint = 'TRUE'
+    prettyPrint = true
     classpath = sourceSets.main.runtimeClasspath
     outputDir = file("${buildDir}/generated/swagger-ui")
     openApiFile = file("config/swagger/fineract-input.yaml")
@@ -153,7 +153,7 @@ configurations {
     driver
 }
 dependencies {
-    driver 'org.mariadb.jdbc:mariadb-java-client:3.0.3'
+    driver 'org.mariadb.jdbc:mariadb-java-client:2.7.5'
     driver 'org.postgresql:postgresql:42.3.3'
 }
 

fineract-provider/dependencies.gradle

@@ -135,6 +135,7 @@ dependencies {
         exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
         exclude group: 'jakarta.activation'
         exclude group: 'javax.activation'
+        exclude group: 'org.skyscreamer'
     }
 
 }

fineract-provider/src/main/java/org/apache/fineract/accounting/closure/api/GLClosureJsonInputParams.java

@@ -35,6 +35,7 @@ public enum GLClosureJsonInputParams {
     }
 
     private static final Set<String> values = new HashSet<>();
+
     static {
         for (final GLClosureJsonInputParams type : GLClosureJsonInputParams.values()) {
             values.add(type.value);

fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingConstants.java

@@ -55,6 +55,7 @@ public final class AccountingConstants {
         }
 
         private static final Map<Integer, CashAccountsForLoan> intToEnumMap = new HashMap<>();
+
         static {
             for (final CashAccountsForLoan type : CashAccountsForLoan.values()) {
                 intToEnumMap.put(type.value, type);
@@ -92,6 +93,7 @@ public final class AccountingConstants {
         }
 
         private static final Map<Integer, AccrualAccountsForLoan> intToEnumMap = new HashMap<>();
+
         static {
             for (final AccrualAccountsForLoan type : AccrualAccountsForLoan.values()) {
                 intToEnumMap.put(type.value, type);
@@ -191,6 +193,7 @@ public final class AccountingConstants {
         }
 
         private static final Map<Integer, CashAccountsForSavings> intToEnumMap = new HashMap<>();
+
         static {
             for (final CashAccountsForSavings type : CashAccountsForSavings.values()) {
                 intToEnumMap.put(type.value, type);
@@ -278,6 +281,7 @@ public final class AccountingConstants {
         private final GLAccountType mappedGLAccountType;
 
         private static List<FinancialActivityData> financialActivities;
+
         static {
             financialActivities = new ArrayList<>();
             for (final FinancialActivity type : FinancialActivity.values()) {
@@ -314,6 +318,7 @@ public final class AccountingConstants {
         }
 
         private static final Map<Integer, FinancialActivity> intToEnumMap = new HashMap<>();
+
         static {
             for (final FinancialActivity type : FinancialActivity.values()) {
                 intToEnumMap.put(type.value, type);
@@ -363,6 +368,7 @@ public final class AccountingConstants {
         }
 
         private static final Map<Integer, CashAccountsForShares> intToEnumMap = new HashMap<>();
+
         static {
             for (final CashAccountsForShares type : CashAccountsForShares.values()) {
                 intToEnumMap.put(type.value, type);

fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingRuleType.java

@@ -32,6 +32,7 @@ public enum AccountingRuleType {
     private final String code;
 
     private static final Map<Integer, AccountingRuleType> intToEnumMap = new HashMap<>();
+
     static {
         for (final AccountingRuleType type : AccountingRuleType.values()) {
             intToEnumMap.put(type.value, type);

fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsJsonInputParams.java

@@ -35,6 +35,7 @@ public enum FinancialActivityAccountsJsonInputParams {
     }
 
     private static final Set<String> values = new HashSet<>();
+
     static {
         for (final FinancialActivityAccountsJsonInputParams type : FinancialActivityAccountsJsonInputParams.values()) {
             values.add(type.value);

fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/api/GLAccountJsonInputParams.java

@@ -36,6 +36,7 @@ public enum GLAccountJsonInputParams {
     }
 
     private static final Set<String> values = new HashSet<>();
+
     static {
         for (final GLAccountJsonInputParams type : GLAccountJsonInputParams.values()) {
             values.add(type.value);

fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/GLAccountType.java

@@ -46,6 +46,7 @@ public enum GLAccountType {
     private static final Map<Integer, GLAccountType> intToEnumMap = new HashMap<>();
     private static int minValue;
     private static int maxValue;
+
     static {
         int i = 0;
         for (final GLAccountType type : GLAccountType.values()) {

fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/GLAccountUsage.java

@@ -44,6 +44,7 @@ public enum GLAccountUsage {
     private static final Map<Integer, GLAccountUsage> intToEnumMap = new HashMap<>();
     private static int minValue;
     private static int maxValue;
+
     static {
         int i = 0;
         for (final GLAccountUsage type : GLAccountUsage.values()) {

fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/api/JournalEntryJsonInputParams.java

@@ -39,6 +39,7 @@ public enum JournalEntryJsonInputParams {
     }
 
     private static final Set<String> values = new HashSet<>();
+
     static {
         for (final JournalEntryJsonInputParams type : JournalEntryJsonInputParams.values()) {
             values.add(type.value);

fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/domain/JournalEntryType.java

@@ -42,6 +42,7 @@ public enum JournalEntryType {
     }
 
     private static final Map<Integer, JournalEntryType> intToEnumMap = new HashMap<>();
+
     static {
         for (final JournalEntryType type : JournalEntryType.values()) {
             intToEnumMap.put(type.value, type);

fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleJsonInputParams.java

@@ -38,6 +38,7 @@ public enum AccountingRuleJsonInputParams {
     }
 
     private static final Set<String> values = new HashSet<>();
+
     static {
         for (final AccountingRuleJsonInputParams type : AccountingRuleJsonInputParams.values()) {
             values.add(type.value);

fineract-provider/src/main/java/org/apache/fineract/adhocquery/api/AdHocJsonInputParams.java

@@ -36,6 +36,7 @@ public enum AdHocJsonInputParams {
     }
 
     private static final Set<String> values = new HashSet<>();
+
     static {
         for (final AdHocJsonInputParams type : AdHocJsonInputParams.values()) {
             values.add(type.value);

fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/AccountNumberFormatEnumerations.java

@@ -79,6 +79,7 @@ public final class AccountNumberFormatEnumerations {
         private static final Map<Integer, AccountNumberPrefixType> intToEnumMap = new HashMap<>();
         private static int minValue;
         private static int maxValue;
+
         static {
             int i = 0;
             for (final AccountNumberPrefixType type : AccountNumberPrefixType.values()) {

fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/EntityAccountType.java

@@ -45,6 +45,7 @@ public enum EntityAccountType {
     private static final Map<Integer, EntityAccountType> intToEnumMap = new HashMap<>();
     private static int minValue;
     private static int maxValue;
+
     static {
         int i = 0;
         for (final EntityAccountType type : EntityAccountType.values()) {

fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/ImportHandlerUtils.java

@@ -326,7 +326,7 @@ public final class ImportHandlerUtils {
                     }
                 }
             }
-        } else if (sheetName.equals(TemplatePopulateImportConstants.PRODUCT_SHEET_NAME)) {
+        } else {
             for (Row row : sheet) {
                 for (int i = 0; i < 2; i++) {
                     if (name != null) {

fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/data/EmailConfigurationValidator.java

@@ -51,7 +51,7 @@ public final class EmailConfigurationValidator {
             EmailApiConstants.SMTP_PASSWORD, EmailApiConstants.SMTP_USERNAME, EmailApiConstants.SMTP_SERVER));
 
     @Autowired
-    private EmailConfigurationValidator(final FromJsonHelper fromApiJsonHelper) {
+    public EmailConfigurationValidator(final FromJsonHelper fromApiJsonHelper) {
         this.fromApiJsonHelper = fromApiJsonHelper;
     }
 

fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailMessageJobEmailServiceImpl.java

@@ -40,7 +40,7 @@ public final class EmailMessageJobEmailServiceImpl implements EmailMessageJobEma
     private final ExternalServicesPropertiesReadPlatformService externalServicesReadPlatformService;
 
     @Autowired
-    private EmailMessageJobEmailServiceImpl(ExternalServicesPropertiesReadPlatformService externalServicesReadPlatformService) {
+    public EmailMessageJobEmailServiceImpl(ExternalServicesPropertiesReadPlatformService externalServicesReadPlatformService) {
         this.externalServicesReadPlatformService = externalServicesReadPlatformService;
     }
 

fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/CodeConstants.java

@@ -38,6 +38,7 @@ public class CodeConstants {
         }
 
         private static final Set<String> values = new HashSet<>();
+
         static {
             for (final CodevalueJSONinputParams type : CodevalueJSONinputParams.values()) {
                 values.add(type.value);

fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/data/EntityTables.java

@@ -39,6 +39,7 @@ public enum EntityTables {
                                     "savings_account_id");
 
     private static final Map<String, EntityTables> lookup = new HashMap<String, EntityTables>();
+
     static {
         for (EntityTables d : EntityTables.values()) {
             lookup.put(d.getName(), d);

fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/domain/StorageType.java

@@ -36,6 +36,7 @@ public enum StorageType {
     }
 
     private static final Map<Integer, StorageType> intToEnumMap = new HashMap<>();
+
     static {
         for (final StorageType type : StorageType.values()) {
             intToEnumMap.put(type.value, type);

fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/domain/FineractEntityRelationRepositoryWrapper.java

@@ -28,9 +28,8 @@ public final class FineractEntityRelationRepositoryWrapper {
     private final FineractEntityRelationRepository fineractEntityRelationRepository;
 
     @Autowired
-    private FineractEntityRelationRepositoryWrapper(final FineractEntityRelationRepository fineractEntityRelationRepository) {
+    public FineractEntityRelationRepositoryWrapper(final FineractEntityRelationRepository fineractEntityRelationRepository) {
         this.fineractEntityRelationRepository = fineractEntityRelationRepository;
-
     }
 
     public FineractEntityRelation findOneWithNotFoundDetection(final Long id) {

fineract-provider/src/main/java/org/apache/fineract/organisation/office/domain/Office.java

@@ -217,11 +217,10 @@ public class Office extends AbstractPersistableCustom implements Serializable {
     }
 
     public boolean hasParentOf(final Office office) {
-        boolean isParent = false;
         if (this.parent != null) {
-            isParent = this.parent.equals(office);
+            return this.parent.equals(office);
         }
-        return isParent;
+        return false;
     }
 
     public boolean doesNotHaveAnOfficeInHierarchyWithId(final Long officeId) {
@@ -241,7 +240,7 @@ public class Office extends AbstractPersistableCustom implements Serializable {
                 final boolean result = child.hasAnOfficeInHierarchyWithId(officeId);
 
                 if (result) {
-                    match = result;
+                    match = true;
                     break;
                 }
             }

fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/domain/RepaymentRescheduleType.java

@@ -52,6 +52,7 @@ public enum RepaymentRescheduleType {
     private static final Map<Integer, RepaymentRescheduleType> intToEnumMap = new HashMap<>();
     private static int minValue;
     private static int maxValue;
+
     static {
         int i = 0;
         for (final RepaymentRescheduleType entityType : RepaymentRescheduleType.values()) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/address/domain/FieldConfiguration.java

@@ -38,12 +38,10 @@ public class FieldConfiguration extends AbstractPersistableCustom {
 
     }
 
-    private FieldConfiguration(final String entity, final String table, final String field, final boolean is_enabled) {
+    public FieldConfiguration(final String entity, final String table, final String field, final boolean is_enabled) {
         this.entity = entity;
         this.table = table;
         this.field = field;
         this.isEnabled = is_enabled;
-
     }
-
 }

fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/CalendarConstants.java

@@ -50,6 +50,7 @@ public final class CalendarConstants {
         }
 
         private static final Set<String> values = new HashSet<>();
+
         static {
             for (final CalendarSupportedParameters param : CalendarSupportedParameters.values()) {
                 values.add(param.value);

fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarEntityType.java

@@ -51,6 +51,7 @@ public enum CalendarEntityType {
     private static final Map<Integer, CalendarEntityType> intToEnumMap = new HashMap<>();
     private static int minValue;
     private static int maxValue;
+
     static {
         int i = 0;
         for (final CalendarEntityType entityType : CalendarEntityType.values()) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarRemindBy.java

@@ -44,6 +44,7 @@ public enum CalendarRemindBy {
     private static final Map<Integer, CalendarRemindBy> intToEnumMap = new HashMap<>();
     private static int minValue;
     private static int maxValue;
+
     static {
         int i = 0;
         for (final CalendarRemindBy remindBy : CalendarRemindBy.values()) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarType.java

@@ -45,6 +45,7 @@ public enum CalendarType {
     private static final Map<Integer, CalendarType> intToEnumMap = new HashMap<>();
     private static int minValue;
     private static int maxValue;
+
     static {
         int i = 0;
         for (final CalendarType type : CalendarType.values()) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/domain/Charge.java

@@ -231,7 +231,7 @@ public class Charge extends AbstractPersistableCustom {
             }
 
             if (enableFreeWithdrawalCharge) {
-                this.enableFreeWithdrawal = enableFreeWithdrawalCharge;
+                this.enableFreeWithdrawal = true;
                 this.freeWithdrawalFrequency = freeWithdrawalFrequency;
                 this.restartFrequency = restartFrequency;
                 this.restartFrequencyEnum = restartFrequencyEnum.getValue();
@@ -240,7 +240,7 @@ public class Charge extends AbstractPersistableCustom {
             if (enablePaymentType) {
                 if (paymentType != null) {
 
-                    this.enablePaymentType = enablePaymentType;
+                    this.enablePaymentType = true;
                     this.paymentType = paymentType;
                 }
             }

fineract-provider/src/main/java/org/apache/fineract/portfolio/client/serialization/ClientFamilyMemberCommandFromApiJsonDeserializer.java

@@ -49,7 +49,7 @@ public final class ClientFamilyMemberCommandFromApiJsonDeserializer {
             "professionId", "locale", "dateFormat", "familyMembers"));
 
     @Autowired
-    private ClientFamilyMemberCommandFromApiJsonDeserializer(final FromJsonHelper fromApiJsonHelper) {
+    public ClientFamilyMemberCommandFromApiJsonDeserializer(final FromJsonHelper fromApiJsonHelper) {
         this.fromApiJsonHelper = fromApiJsonHelper;
     }
 

fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/api/CollateralApiConstants.java

@@ -44,6 +44,7 @@ public final class CollateralApiConstants {
         }
 
         private static final Set<String> values = new HashSet<>();
+
         static {
             for (final CollateralJSONinputParams type : CollateralJSONinputParams.values()) {
                 values.add(type.value);

fineract-provider/src/main/java/org/apache/fineract/portfolio/common/BusinessEventNotificationConstants.java

@@ -83,6 +83,7 @@ public class BusinessEventNotificationConstants {
         }
 
         private static final Set<String> values = new HashSet<>();
+
         static {
             for (final BusinessEvents type : BusinessEvents.values()) {
                 values.add(type.value);

fineract-provider/src/main/java/org/apache/fineract/portfolio/common/domain/ConditionType.java

@@ -35,6 +35,7 @@ public enum ConditionType {
     private final String code;
 
     private static final Map<Integer, ConditionType> intToEnumMap = new HashMap<>();
+
     static {
         for (final ConditionType type : ConditionType.values()) {
             intToEnumMap.put(type.value, type);

fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/GroupTypes.java

@@ -40,6 +40,7 @@ public enum GroupTypes {
     private static final Map<Long, GroupTypes> intToEnumMap = new HashMap<>();
     private static long minValue;
     private static long maxValue;
+
     static {
         int i = 0;
         for (final GroupTypes type : GroupTypes.values()) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveAttributeName.java

@@ -35,6 +35,7 @@ public enum InterestIncentiveAttributeName {
     private final String code;
 
     private static final Map<Integer, InterestIncentiveAttributeName> intToEnumMap = new HashMap<>();
+
     static {
         for (final InterestIncentiveAttributeName type : InterestIncentiveAttributeName.values()) {
             intToEnumMap.put(type.value, type);

fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveEntityType.java

@@ -33,6 +33,7 @@ public enum InterestIncentiveEntityType {
     private final String code;
 
     private static final Map<Integer, InterestIncentiveEntityType> intToEnumMap = new HashMap<>();
+
     static {
         for (final InterestIncentiveEntityType type : InterestIncentiveEntityType.values()) {
             intToEnumMap.put(type.value, type);

fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/InterestIncentiveType.java

@@ -33,6 +33,7 @@ public enum InterestIncentiveType {
     private final String code;
 
     private static final Map<Integer, InterestIncentiveType> intToEnumMap = new HashMap<>();
+
     static {
         for (final InterestIncentiveType type : InterestIncentiveType.values()) {
             intToEnumMap.put(type.value, type);

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/GuarantorConstants.java

@@ -47,6 +47,7 @@ public final class GuarantorConstants {
         }
 
         private static final Set<String> values = new HashSet<>();
+
         static {
             for (final GuarantorJSONinputParams type : GuarantorJSONinputParams.values()) {
                 values.add(type.value);

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/domain/GuarantorType.java

@@ -44,6 +44,7 @@ public enum GuarantorType {
     private static final Map<Integer, GuarantorType> intToEnumMap = new HashMap<>();
     private static int minValue;
     private static int maxValue;
+
     static {
         int i = 0;
         for (final GuarantorType type : GuarantorType.values()) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/service/LoanScheduleAssembler.java

@@ -584,7 +584,7 @@ public class LoanScheduleAssembler {
             if (!meetingFrequency.equals(repaymentFrequency)) {
                 throw new MeetingFrequencyMismatchException("loanapplication.repayment.frequency",
                         "Loan repayment frequency period must match that of meeting frequency period", repaymentFrequency);
-            } else if (meetingFrequency.equals(repaymentFrequency)) {
+            } else {
                 // repayment frequency is same as meeting frequency repayment
                 // interval should be same or multiple of meeting interval
                 if (repaymentInterval % meetingInterval != 0) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/InterestRecalculationCompoundingMethod.java

@@ -42,6 +42,7 @@ public enum InterestRecalculationCompoundingMethod {
     private final String code;
 
     private static final Map<Integer, InterestRecalculationCompoundingMethod> intToEnumMap = new HashMap<>();
+
     static {
         for (final InterestRecalculationCompoundingMethod type : InterestRecalculationCompoundingMethod.values()) {
             intToEnumMap.put(type.value, type);

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LendingStrategy.java

@@ -49,6 +49,7 @@ public enum LendingStrategy {
     private static final Map<Integer, LendingStrategy> intToEnumMap = new HashMap<>();
     private static int minValue;
     private static int maxValue;
+
     static {
         int i = 0;
         for (final LendingStrategy type : LendingStrategy.values()) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanPreClosureInterestCalculationStrategy.java

@@ -36,6 +36,7 @@ public enum LoanPreClosureInterestCalculationStrategy {
     private static final Map<Integer, LoanPreClosureInterestCalculationStrategy> intToEnumMap = new HashMap<>();
     private static int minValue;
     private static int maxValue;
+
     static {
         int i = 0;
         for (final LoanPreClosureInterestCalculationStrategy type : LoanPreClosureInterestCalculationStrategy.values()) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/note/domain/NoteType.java

@@ -56,6 +56,7 @@ public enum NoteType {
     private static final Map<Integer, NoteType> intToEnumMap = new HashMap<>();
     private static int minValue;
     private static int maxValue;
+
     static {
         int i = 0;
         for (final NoteType type : NoteType.values()) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/search/SearchConstants.java

@@ -36,6 +36,7 @@ public class SearchConstants {
         }
 
         private static final Set<String> values = new HashSet<>();
+
         static {
             for (final SearchResponseParameters param : SearchResponseParameters.values()) {
                 values.add(param.value);
@@ -67,6 +68,7 @@ public class SearchConstants {
         }
 
         private static final Set<String> values = new HashSet<>();
+
         static {
             for (final SearchSupportedParameters param : SearchSupportedParameters.values()) {
                 values.add(param.value);
@@ -98,6 +100,7 @@ public class SearchConstants {
         }
 
         private static final Set<String> values = new HashSet<>();
+
         static {
             for (final SearchSupportedResources param : SearchSupportedResources.values()) {
                 values.add(param.value);
@@ -129,6 +132,7 @@ public class SearchConstants {
         }
 
         private static final Set<String> values = new HashSet<>();
+
         static {
             for (final SearchLoanDate param : SearchLoanDate.values()) {
                 values.add(param.value);

integration-tests/dependencies.gradle

@@ -28,6 +28,8 @@ dependencies {
             'com.google.truth:truth',
             'com.google.truth.extensions:truth-java8-extension',
             'org.awaitility:awaitility',
+            'org.bouncycastle:bcpkix-jdk15on',
+            'org.bouncycastle:bcprov-jdk15on'
             // 'com.google.code.gson:gson',
             )
     testImplementation ('org.mock-server:mockserver-junit-jupiter') {

integration-tests/src/test/java/org/apache/fineract/integrationtests/common/PaymentTypeDomain.java

@@ -26,7 +26,7 @@ public final class PaymentTypeDomain {
     private Boolean isCashPayment;
     private Integer position;
 
-    private PaymentTypeDomain(final Integer id, final String name, final String description, final Boolean isCashPayment,
+    public PaymentTypeDomain(final Integer id, final String name, final String description, final Boolean isCashPayment,
             final Integer position) {
         this.id = id;
         this.name = name;