Skip to content

Commit e78c64a

Browse files
budaidevbudaidev
committed
Merge branch 'develop' into FINERACT-2380/e2e-test-to-feign
# Conflicts: # fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/helper/ErrorMessageHelper.java # fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanInterestPauseStepDef.java # fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanReAgingStepDef.java # fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/loan/LoanStepDef.java
2 parents 41e774a + da1f310 commit e78c64a

169 files changed

Lines changed: 15600 additions & 2319 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build-cucumber.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
8888
- name: Archive test results
8989
if: always()
90-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
90+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v4
9191
with:
9292
name: test-results-${{ matrix.task }}
9393
path: |
@@ -98,7 +98,7 @@ jobs:
9898

9999
- name: Archive Progressive Loan JAR
100100
if: matrix.job_type == 'progressive-loan' && always()
101-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
101+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v4
102102
with:
103103
name: progressive-loan-jar
104104
path: ${{ env.EMBEDDABLE_JAR_FILE }}
@@ -107,7 +107,7 @@ jobs:
107107

108108
- name: Archive server logs
109109
if: always()
110-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
110+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v4
111111
with:
112112
name: server-logs-${{ matrix.task }}
113113
path: '**/build/cargo/'

‎.github/workflows/build-e2e-tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
147147
- name: Upload test results
148148
if: always()
149-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
149+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v4
150150
with:
151151
name: allure-results-shard-${{ matrix.shard_index }}
152152
path: |
@@ -159,15 +159,15 @@ jobs:
159159

160160
- name: Upload Allure Report
161161
if: always()
162-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
162+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v4
163163
with:
164164
name: allure-report-shard-${{ matrix.shard_index }}
165165
path: allure-report-shard-${{ matrix.shard_index }}
166166
retention-days: 5
167167

168168
- name: Upload logs
169169
if: always()
170-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
170+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v4
171171
with:
172172
name: logs-shard-${{ matrix.shard_index }}
173173
path: |

‎.github/workflows/build-mariadb.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,15 +135,15 @@ jobs:
135135
136136
- name: Archive test results
137137
if: always()
138-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
138+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v4
139139
with:
140140
name: test-results-${{ matrix.task }}
141141
path: '**/build/reports/'
142142
retention-days: 5
143143

144144
- name: Archive server logs
145145
if: always()
146-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
146+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v4
147147
with:
148148
name: server-logs-${{ matrix.task }}
149149
path: '**/build/cargo/'

‎.github/workflows/build-mysql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,15 +135,15 @@ jobs:
135135
136136
- name: Archive test results
137137
if: always()
138-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
138+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v4
139139
with:
140140
name: test-results-${{ matrix.task }}
141141
path: '**/build/reports/'
142142
retention-days: 5
143143

144144
- name: Archive server logs
145145
if: always()
146-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
146+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v4
147147
with:
148148
name: server-logs-${{ matrix.task }}
149149
path: '**/build/cargo/'

‎.github/workflows/build-postgresql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,15 @@ jobs:
136136
137137
- name: Archive test results
138138
if: always()
139-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
139+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v4
140140
with:
141141
name: test-results-${{ matrix.task }}
142142
path: '**/build/reports/'
143143
retention-days: 5
144144

145145
- name: Archive server logs
146146
if: always()
147-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
147+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v4
148148
with:
149149
name: server-logs-${{ matrix.task }}
150150
path: '**/build/cargo/'

‎.github/workflows/liquibase-only-postgresql.yml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
name: Fineract Liquibase Only mode - PostgreSQL
2+
3+
on: [push, pull_request]
4+
5+
permissions:
6+
contents: read
7+
8+
jobs:
9+
test:
10+
runs-on: ubuntu-22.04
11+
timeout-minutes: 60
12+
13+
services:
14+
postgresql:
15+
image: postgres:17.4
16+
ports:
17+
- 5432:5432
18+
env:
19+
POSTGRES_USER: root
20+
POSTGRES_PASSWORD: postgres
21+
options: --health-cmd="pg_isready -q -d postgres -U root" --health-interval=5s --health-timeout=2s --health-retries=3
22+
23+
env:
24+
TZ: Asia/Kolkata
25+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
26+
27+
steps:
28+
- name: Checkout
29+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
30+
with:
31+
fetch-depth: 0
32+
fetch-tags: true
33+
34+
- name: Set up JDK 21
35+
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5
36+
with:
37+
java-version: '21'
38+
distribution: 'zulu'
39+
40+
- name: Cache Gradle dependencies
41+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
42+
with:
43+
path: |
44+
~/.gradle/caches
45+
~/.gradle/wrapper
46+
key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
47+
48+
- name: Setup Gradle and Validate Wrapper
49+
uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0
50+
with:
51+
validate-wrappers: true
52+
53+
- name: Verify PostgreSQL connection
54+
run: |
55+
while ! pg_isready -d postgres -U root -h 127.0.0.1 -p 5432 ; do
56+
sleep 1
57+
done
58+
59+
- name: Initialise databases
60+
run: |
61+
./gradlew --no-daemon -q createPGDB -PdbName=fineract_tenants
62+
./gradlew --no-daemon -q createPGDB -PdbName=fineract_default
63+
64+
- name: Run Fineract in Liquibase only mode
65+
env:
66+
FINERACT_DEFAULT_TENANTDB_CONN_PARAMS: ""
67+
FINERACT_DEFAULT_TENANTDB_DESCRIPTION: "Default Demo Tenant"
68+
FINERACT_DEFAULT_TENANTDB_HOSTNAME: "localhost"
69+
FINERACT_DEFAULT_TENANTDB_IDENTIFIER: "default"
70+
FINERACT_DEFAULT_TENANTDB_NAME: "fineract_default"
71+
FINERACT_DEFAULT_TENANTDB_PORT: "5432"
72+
FINERACT_DEFAULT_TENANTDB_PWD: "postgres"
73+
FINERACT_DEFAULT_TENANTDB_TIMEZONE: "Asia/Kolkata"
74+
FINERACT_DEFAULT_TENANTDB_UID: "root"
75+
FINERACT_HIKARI_DRIVER_SOURCE_CLASS_NAME: "org.postgresql.Driver"
76+
FINERACT_HIKARI_JDBC_URL: "jdbc:postgresql://localhost:5432/fineract_tenants"
77+
FINERACT_HIKARI_PASSWORD: "postgres"
78+
FINERACT_HIKARI_USERNAME: "root"
79+
SPRING_PROFILES_ACTIVE: "liquibase-only"
80+
run:
81+
./gradlew fineract-provider:bootRun

‎.github/workflows/run-integration-test-sequentially-postgresql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
./gradlew --no-daemon --console=plain :oauth2-tests:test -PdbType=postgresql
8585
- name: Archive test results
8686
if: always()
87-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
87+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v4
8888
with:
8989
name: test-results
9090
retention-days: 5
@@ -95,7 +95,7 @@ jobs:
9595
oauth2-tests/build/reports/
9696
- name: Archive server logs
9797
if: always()
98-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
98+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v4
9999
with:
100100
name: server-logs
101101
retention-days: 5

‎buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ dependencyManagement {
6464
exclude 'javax.activation:activation'
6565
}
6666
dependency 'commons-io:commons-io:2.18.0'
67-
dependency 'com.github.librepdf:openpdf:2.0.3'
67+
dependency 'com.github.librepdf:openpdf:3.0.0'
6868
dependency ('org.mnode.ical4j:ical4j:3.2.19') {
6969
exclude 'com.sun.mail:javax.mail'
7070
exclude 'org.codehaus.groovy:groovy'
@@ -195,10 +195,10 @@ dependencyManagement {
195195
dependency 'jakarta.validation:jakarta.validation-api:3.1.1'
196196
dependency 'org.hibernate.validator:hibernate-validator:9.0.1.Final'
197197

198-
dependency ('org.liquibase:liquibase-core:4.31.1') {
198+
dependency ('org.liquibase:liquibase-core:5.0.1') {
199199
exclude 'javax.xml.bind:jaxb-api'
200200
}
201-
dependency 'org.liquibase.ext:liquibase-postgresql:4.31.1'
201+
dependency 'org.liquibase.ext:liquibase-postgresql:5.0.1'
202202

203203
dependency ('org.dom4j:dom4j:2.1.4') {
204204
exclude 'relaxngDatatype:relaxngDatatype' // already in com.sun.xml.bind:jaxb-osgi:2.3.0.1

‎config/docker/env/kafka-server.env‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,16 @@
1717
# under the License.
1818
#
1919

20-
KAFKA_CFG_NODE_ID=0
21-
KAFKA_CFG_PROCESS_ROLES=controller,broker
22-
KAFKA_CFG_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093
23-
KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
24-
KAFKA_CFG_CONTROLLER_QUORUM_VOTERS=0@kafka:9093
25-
KAFKA_CFG_CONTROLLER_LISTENER_NAMES=CONTROLLER
26-
ALLOW_PLAINTEXT_LISTENER=yes
20+
21+
KAFKA_NODE_ID=0
22+
KAFKA_PROCESS_ROLES=controller,broker
23+
KAFKA_LISTENERS=PLAINTEXT://:9092,CONTROLLER://:9093
2724
KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092
25+
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
26+
KAFKA_CONTROLLER_QUORUM_VOTERS=0@kafka:9093
27+
KAFKA_CONTROLLER_LISTENER_NAMES=CONTROLLER
28+
KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1
29+
KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR=1
30+
KAFKA_TRANSACTION_STATE_LOG_MIN_ISR=1
31+
KAFKA_LOG_DIRS=/var/lib/kafka/data
32+
KAFKA_BROKER_ID=0

‎docker-compose-postgresql-kafka.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
version: "3.7"
2121
services:
2222
kafka:
23-
image: "bitnamilegacy/kafka:4.0.0-debian-12-r10"
23+
image: "apache/kafka:4.1.1-rc2"
2424
ports:
2525
- "9092:9092"
2626
env_file:

0 commit comments

Comments
 (0)