Skip to content

Commit e4944c4

Browse files
vidakovicvidakovic
committed
FINERACT-2009: Upgrade latest framework libs
1 parent 1f3bb34 commit e4944c4

193 files changed

Lines changed: 1568 additions & 1391 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-docker-mariadb.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,19 @@ jobs:
1616
with:
1717
fetch-depth: 0
1818
- name: Set up JDK 17
19-
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3
19+
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
2020
with:
2121
java-version: '17'
2222
distribution: 'zulu'
2323
cache: gradle
2424
- name: Build the image
25-
run: ./gradlew :fineract-provider:clean :fineract-provider:jibDockerBuild -x test
25+
run: ./gradlew --no-daemon --console=plain :fineract-provider:clean :fineract-provider:build :fineract-provider:jibDockerBuild -x test -x cucumber
2626
- name: Start the stack
27-
run: docker-compose up -d
27+
run: docker compose up -d
2828
- name: Wait for stack to come up
29-
run: sleep 300
29+
run: sleep 500
30+
- name: Check the stack
31+
run: docker ps
3032
- name: Check health
3133
run: curl -f -k --retry 10 --retry-connrefused --connect-timeout 30 --retry-delay 30 https://localhost:8443/fineract-provider/actuator/health
3234
- name: Check info

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,19 @@ jobs:
1616
with:
1717
fetch-depth: 0
1818
- name: Set up JDK 17
19-
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3
19+
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
2020
with:
2121
java-version: '17'
2222
distribution: 'zulu'
2323
cache: gradle
2424
- name: Build the image
25-
run: ./gradlew --no-daemon --console=plain :fineract-provider:clean :fineract-provider:jibDockerBuild -x test
25+
run: ./gradlew --no-daemon --console=plain :fineract-provider:clean :fineract-provider:build :fineract-provider:jibDockerBuild -x test -x cucumber
2626
- name: Start the Standalone Stack
27-
run: docker-compose -f docker-compose-postgresql.yml up -d
27+
run: docker compose -f docker-compose-postgresql.yml up -d
2828
- name: Wait for stack to come up
29-
run: sleep 300
29+
run: sleep 500
30+
- name: Check the stack
31+
run: docker ps
3032
- name: Check health
3133
run: curl -f -k --retry 10 --retry-connrefused --connect-timeout 30 --retry-delay 30 https://localhost:8443/fineract-provider/actuator/health
3234
- name: Check info

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
with:
1616
fetch-depth: 0
1717
- name: Set up JDK 17
18-
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3
18+
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
1919
with:
2020
java-version: '17'
2121
distribution: 'zulu'
2222
cache: gradle
23-
- uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4
23+
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4
2424
with:
2525
node-version: 16
2626
- name: Congfigure vega-cli

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ jobs:
1010

1111
services:
1212
mariad:
13-
image: mariadb:11.1
13+
image: mariadb:11.2
1414
ports:
1515
- 3306:3306
1616
env:
1717
MARIADB_ROOT_PASSWORD: mysql
1818
options: --health-cmd="healthcheck.sh --su-mysql --connect --innodb_initialized" --health-interval=5s --health-timeout=2s --health-retries=3
1919

2020
mock-oauth2-server:
21-
image: ghcr.io/navikt/mock-oauth2-server:2.0.1
21+
image: ghcr.io/navikt/mock-oauth2-server:2.1.0
2222
ports:
2323
- 9000:9000
2424
env:
@@ -34,12 +34,12 @@ jobs:
3434
with:
3535
fetch-depth: 0
3636
- name: Set up JDK 17
37-
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3
37+
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
3838
with:
3939
java-version: '17'
4040
distribution: 'zulu'
4141
cache: gradle
42-
- uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4
42+
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4
4343
with:
4444
node-version: 16
4545
- name: Congfigure vega-cli
@@ -88,17 +88,18 @@ jobs:
8888
8989
- name: Archive test results
9090
if: always()
91-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # tag=v3
91+
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # tag=v3
9292
with:
9393
name: test-results
9494
path: |
95+
build/reports/
9596
integration-tests/build/reports/
9697
twofactor-tests/build/reports/
9798
oauth2-tests/build/reports/
9899
99100
- name: Archive server logs
100101
if: always()
101-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # tag=v3
102+
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # tag=v3
102103
with:
103104
name: server-logs
104105
path: |

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
1919

2020
mock-oauth2-server:
21-
image: ghcr.io/navikt/mock-oauth2-server:2.0.1
21+
image: ghcr.io/navikt/mock-oauth2-server:2.1.0
2222
ports:
2323
- 9000:9000
2424
env:
@@ -34,12 +34,12 @@ jobs:
3434
with:
3535
fetch-depth: 0
3636
- name: Set up JDK 17
37-
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3
37+
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
3838
with:
3939
java-version: '17'
4040
distribution: 'zulu'
4141
cache: gradle
42-
- uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4
42+
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4
4343
with:
4444
node-version: 16
4545
- name: Congfigure vega-cli
@@ -88,17 +88,18 @@ jobs:
8888
8989
- name: Archive test results
9090
if: always()
91-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # tag=v3
91+
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # tag=v3
9292
with:
9393
name: test-results
9494
path: |
95+
build/reports/
9596
integration-tests/build/reports/
9697
twofactor-tests/build/reports/
9798
oauth2-tests/build/reports/
9899
99100
- name: Archive server logs
100101
if: always()
101-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # tag=v3
102+
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # tag=v3
102103
with:
103104
name: server-logs
104105
path: |

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
options: --health-cmd="pg_isready -q -d postgres -U root" --health-interval=5s --health-timeout=2s --health-retries=3
2020

2121
mock-oauth2-server:
22-
image: ghcr.io/navikt/mock-oauth2-server:2.0.1
22+
image: ghcr.io/navikt/mock-oauth2-server:2.1.0
2323
ports:
2424
- 9000:9000
2525
env:
@@ -35,12 +35,12 @@ jobs:
3535
with:
3636
fetch-depth: 0
3737
- name: Set up JDK 17
38-
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3
38+
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
3939
with:
4040
java-version: '17'
4141
distribution: 'zulu'
4242
cache: gradle
43-
- uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4
43+
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4
4444
with:
4545
node-version: 16
4646
- name: Congfigure vega-cli
@@ -89,17 +89,18 @@ jobs:
8989
9090
- name: Archive test results
9191
if: always()
92-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # tag=v3
92+
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # tag=v3
9393
with:
9494
name: test-results
9595
path: |
96+
build/reports/
9697
integration-tests/build/reports/
9798
twofactor-tests/build/reports/
9899
oauth2-tests/build/reports/
99100
100101
- name: Archive server logs
101102
if: always()
102-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # tag=v3
103+
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # tag=v3
103104
with:
104105
name: server-logs
105106
path: |

‎.github/workflows/smoke-activemq.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,19 @@ jobs:
1616
with:
1717
fetch-depth: 0
1818
- name: Set up JDK 17
19-
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3
19+
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
2020
with:
2121
java-version: '17'
2222
distribution: 'zulu'
2323
cache: gradle
2424
- name: Build the image
25-
run: ./gradlew --no-daemon --console=plain :fineract-provider:clean :fineract-provider:jibDockerBuild -x test
25+
run: ./gradlew --no-daemon --console=plain :fineract-provider:clean :fineract-provider:build :fineract-provider:jibDockerBuild -x test -x cucumber
2626
- name: Start the ActiveMQ Stack
27-
run: docker-compose -f docker-compose-postgresql-activemq.yml up --scale fineract-worker=1 -d
27+
run: docker compose -f docker-compose-postgresql-activemq.yml up --scale fineract-worker=1 -d
2828
- name: Wait for stack to come up
2929
run: sleep 500
30+
- name: Check the stack
31+
run: docker ps
3032
- name: Check health Manager
3133
run: curl -f -k --retry 10 --retry-connrefused --connect-timeout 30 --retry-delay 30 https://localhost:8443/fineract-provider/actuator/health
3234
- name: Check health Worker1

‎.github/workflows/smoke-kafka.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,19 @@ jobs:
1616
with:
1717
fetch-depth: 0
1818
- name: Set up JDK 17
19-
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3
19+
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
2020
with:
2121
java-version: '17'
2222
distribution: 'zulu'
2323
cache: gradle
2424
- name: Build the image
25-
run: ./gradlew --no-daemon --console=plain :fineract-provider:clean :fineract-provider:jibDockerBuild -x test
25+
run: ./gradlew --no-daemon --console=plain :fineract-provider:clean :fineract-provider:build :fineract-provider:jibDockerBuild -x test -x cucumber
2626
- name: Start the Kafka Stack
27-
run: docker-compose -f docker-compose-postgresql-kafka.yml up --scale fineract-worker=1 -d
27+
run: docker compose -f docker-compose-postgresql-kafka.yml up --scale fineract-worker=1 -d
2828
- name: Wait for stack to come up
2929
run: sleep 500
30+
- name: Check the stack
31+
run: docker ps
3032
- name: Check health Manager
3133
run: curl -f -k --retry 10 --retry-connrefused --connect-timeout 30 --retry-delay 30 https://localhost:8443/fineract-provider/actuator/health
3234
- name: Check health Worker1

‎.github/workflows/sonarqube.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
with:
2525
fetch-depth: 0
2626
- name: Set up JDK 17
27-
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3
27+
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4
2828
with:
2929
java-version: '17'
3030
distribution: 'zulu'

‎.github/workflows/stale.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
pull-requests: write # for actions/stale to close stale PRs
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/stale@1160a2240286f5da8ec72b1c0816ce2481aabf84 # v8
18+
- uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9
1919
with:
2020
repo-token: ${{ secrets.GITHUB_TOKEN }}
2121
# stale-issue-message: 'Stale issue message'

0 commit comments

Comments
 (0)