Skip to content

Commit 338e50d

Browse files
authored
Merge branch 'main' into jdk-25
2 parents 33d262e + 133c8db commit 338e50d

33 files changed

Lines changed: 209 additions & 214 deletions

File tree

.github/workflows/docker.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
name: Lint Dockerfile
1919
runs-on: ubuntu-24.04
2020
steps:
21-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
21+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2222
- uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
2323

2424
build:
@@ -31,7 +31,7 @@ jobs:
3131
id-token: write
3232
security-events: write
3333
steps:
34-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
34+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3535
- uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
3636
with:
3737
registry: ghcr.io
@@ -70,7 +70,7 @@ jobs:
7070
*.cache-from=type=gha
7171
*.cache-to=type=gha,mode=max
7272
73-
- uses: anchore/scan-action@3c9a191a0fbab285ca6b8530b5de5a642cba332f # v7.2.2
73+
- uses: anchore/scan-action@0d444ed77d83ee2ba7f5ced0d90d640a1281d762 # v7.3.0
7474
id: scan
7575
if: ${{ github.event_name != 'pull_request' && github.event_name != 'merge_group' }}
7676
with:
@@ -79,7 +79,7 @@ jobs:
7979
severity-cutoff: 'high'
8080
fail-build: false
8181

82-
- uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
82+
- uses: github/codeql-action/upload-sarif@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
8383
if: ${{ github.event_name != 'pull_request' && github.event_name != 'merge_group' }}
8484
with:
8585
sarif_file: ${{ steps.scan.outputs.sarif }}

.github/workflows/gradle.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
permissions:
1919
id-token: write # for codecov
2020
steps:
21-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
22-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
21+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
22+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2323
with:
2424
distribution: "liberica"
2525
java-version: 25

.github/workflows/integration.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
runs-on: ubuntu-24.04
1515
name: Test
1616
steps:
17-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
17+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1818
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
19-
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
19+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
2020
with:
2121
node-version-file: '.nvmrc'
2222
cache: 'pnpm'
@@ -30,9 +30,9 @@ jobs:
3030
runs-on: ubuntu-24.04
3131
name: Lint
3232
steps:
33-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
33+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3434
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
35-
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
35+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
3636
with:
3737
node-version-file: '.nvmrc'
3838
cache: 'pnpm'

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ jobs:
2222
permission-issues: write # to be able to comment on released issues
2323
permission-pull-requests: write # to be able to comment on released pull requests
2424

25-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
25+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2626
with:
2727
token: ${{ steps.release-token.outputs.token }}
2828
fetch-depth: 0
2929

3030
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
3131

32-
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
32+
- uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
3333
with:
3434
node-version-file: '.nvmrc'
3535
cache: 'pnpm'

.github/workflows/scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
steps:
3838
- name: "Checkout code"
39-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
39+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4040
with:
4141
persist-credentials: false
4242

@@ -75,6 +75,6 @@ jobs:
7575
# Upload the results to GitHub's code scanning dashboard (optional).
7676
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
7777
- name: "Upload to code-scanning"
78-
uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
78+
uses: github/codeql-action/upload-sarif@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
7979
with:
8080
sarif_file: results.sarif

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24.12.0
1+
24.13.0

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ARG BUILD_ARG="bootJar"
2323
RUN --mount=type=cache,target=/root/.gradle \
2424
./gradlew ${BUILD_ARG}
2525

26-
FROM bellsoft/liberica-runtime-container:jre-25.0.1_11-cds-musl@sha256:964ab76e0affd0994c6058cf9bcf30d150c9c7624a8382c87cbf63b99ed5a884 AS app
26+
FROM bellsoft/liberica-runtime-container:jre-25.0.1_11-cds-musl@sha256:6efae6e8eed881ec66960f22ae91037711d370ff2d66ba024716005398099265 AS app
2727
# use non-root user
2828
RUN addgroup -S spring && adduser -S spring -G spring
2929
USER spring:spring

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ playout --> cg
5555
docker compose up -d
5656
```
5757

58-
### Using gradle
58+
### Using Gradle
5959
```shell
6060
./gradlew bootRun
6161
```

docker-compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616
retries: 5
1717
start_period: 40s
1818
rabbitmq:
19-
image: "rabbitmq:4.2.2-management-alpine@sha256:f10f014d87ff75a34f512eb7e51d0e841021e3888568712ed731032fd8d92d34"
19+
image: "rabbitmq:4.2.3-management-alpine@sha256:7c5fe2a75e711d6012c9c407748cf0b4db8474207a507e4549bbf2342bf711ac"
2020
ports:
2121
- "127.0.0.1:5672:5672"
2222
- "127.0.0.1:15672:15672"
@@ -27,7 +27,7 @@ services:
2727
retries: 5
2828
start_period: 40s
2929
mongo:
30-
image: "mongo:8.2.3@sha256:7f5bbdafebde7c42e42e33396d01c0eda3eb753da8dae99071a30e350568a0a4"
30+
image: "mongo:8.2.3@sha256:d6b569590880bca35e43318418133a426b024bcb649eeb63bb071bc1490bee41"
3131
ports:
3232
- "127.0.0.1:27017:27017"
3333
healthcheck:

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[versions]
2-
springdoc = "3.0.0"
3-
springBoot = "4.0.1"
4-
kotest = "6.0.7"
5-
spotless = "8.1.0"
2+
springdoc = "3.0.1"
3+
springBoot = "4.0.2"
4+
kotest = "6.1.1"
5+
spotless = "8.2.0"
66
detekt = "1.23.8"
77

88
[libraries]

0 commit comments

Comments
 (0)