Skip to content

Commit d22e58b

Browse files
yunomix2834yunomix2834
authored
Merge branch 'main' into dependabot/nuget/FileService/FileService.Api/main/multi-cd5a1bd4d9
2 parents 50f648a + 12ebc38 commit d22e58b

File tree

29 files changed

+108
-103
lines changed

29 files changed

+108
-103
lines changed

‎.github/workflows/ci-sonar.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515

1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v5
1919
with:
2020
fetch-depth: 0 # Sonar cần có full history để tính "blame"
2121

2222
- name: Set up JDK 21
23-
uses: actions/setup-java@v4
23+
uses: actions/setup-java@v5
2424
with:
2525
distribution: 'temurin'
2626
java-version: '21'

‎.github/workflows/coding-service-publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v5
3030

3131
- name: Set up QEMU (multi-arch)
3232
uses: docker/setup-qemu-action@v3

‎.github/workflows/deploy.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
echo "run.head_sha: ${{ github.event.workflow_run.head_sha }}"
4343
4444
- name: Checkout
45-
uses: actions/checkout@v4
45+
uses: actions/checkout@v5
4646

4747
- name: Derive IMAGE_TAG (from workflow_run or manual)
4848
shell: bash
@@ -168,7 +168,7 @@ jobs:
168168
fi
169169
170170
- name: Ensure remote dir exists
171-
uses: appleboy/ssh-action@v1.0.3
171+
uses: appleboy/ssh-action@v1.2.2
172172
env:
173173
DEPLOY_DIR: ${{ steps.targetdir.outputs.DEPLOY_DIR_FINAL }}
174174
with:
@@ -195,7 +195,7 @@ jobs:
195195
test -d deploy_bundle/init/mongo
196196
197197
- name: Pre-clean monitoring paths on server
198-
uses: appleboy/ssh-action@v1.0.3
198+
uses: appleboy/ssh-action@v1.2.2
199199
with:
200200
host: ${{ secrets.SSH_HOST }}
201201
username: ${{ secrets.SSH_USER }}
@@ -216,7 +216,7 @@ jobs:
216216
done
217217
218218
- name: Upload bundle to server
219-
uses: appleboy/scp-action@v0.1.7
219+
uses: appleboy/scp-action@v1.0.0
220220
with:
221221
host: ${{ secrets.SSH_HOST }}
222222
username: ${{ secrets.SSH_USER }}
@@ -228,7 +228,7 @@ jobs:
228228
strip_components: 1
229229

230230
- name: Verify files exist on server (debug)
231-
uses: appleboy/ssh-action@v1.0.3
231+
uses: appleboy/ssh-action@v1.2.2
232232
with:
233233
host: ${{ secrets.SSH_HOST }}
234234
username: ${{ secrets.SSH_USER }}
@@ -238,7 +238,7 @@ jobs:
238238
ls -la '${{ steps.targetdir.outputs.DEPLOY_DIR_FINAL }}'
239239
240240
- name: Verify .env identical & run deploy
241-
uses: appleboy/ssh-action@v1.0.3
241+
uses: appleboy/ssh-action@v1.2.2
242242
env:
243243
IMAGE_TAG: ${{ env.IMAGE_TAG }}
244244
ENV_SHA: ${{ env.ENV_SHA }}

‎.github/workflows/docker-publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
steps:
3838
- name: Checkout
39-
uses: actions/checkout@v4
39+
uses: actions/checkout@v5
4040

4141
- name: Set up QEMU (multi-arch)
4242
uses: docker/setup-qemu-action@v3

‎.github/workflows/file-service-publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v5
3030

3131
- name: Set up QEMU (multi-arch)
3232
uses: docker/setup-qemu-action@v3

‎FileService/FileService.Api/FileService.Api.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88

99
<ItemGroup>
1010
<PackageReference Include="AspNetCore.Identity.Mongo" Version="10.1.0" />
11-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.6" />
11+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.20" />
1212
<PackageReference Include="Minio" Version="6.0.5" />
13-
<PackageReference Include="MongoDB.Bson" Version="3.4.0" />
14-
<PackageReference Include="MongoDB.Driver" Version="3.4.0" />
13+
<PackageReference Include="MongoDB.Bson" Version="3.5.0" />
14+
<PackageReference Include="MongoDB.Driver" Version="3.5.0" />
1515
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
16-
<PackageReference Include="NUnit" Version="4.3.2" />
16+
<PackageReference Include="NUnit" Version="4.4.0" />
1717
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.4" />
1818
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.13.0" />
1919
<PackageReference Include="System.Text.Json" Version="9.0.6" />

‎FileService/FileService.Core/FileService.Core.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88

99
<ItemGroup>
1010
<PackageReference Include="AspNetCore.Identity.Mongo" Version="10.1.0" />
11-
<PackageReference Include="MongoDB.Bson" Version="3.4.0" />
12-
<PackageReference Include="MongoDB.Driver" Version="3.4.0" />
13-
<PackageReference Include="NUnit" Version="4.3.2" />
14-
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.4" />
11+
<PackageReference Include="MongoDB.Bson" Version="3.5.0" />
12+
<PackageReference Include="MongoDB.Driver" Version="3.5.0" />
13+
<PackageReference Include="NUnit" Version="4.4.0" />
14+
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.0.0" />
1515
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.13.0" />
1616
<PackageReference Include="System.Text.Json" Version="9.0.6" />
1717
<PackageReference Include="Xabe.FFmpeg" Version="6.0.1" />

‎FileService/FileService.DataAccess/FileService.DataAccess.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
<ItemGroup>
1010
<PackageReference Include="AspNetCore.Identity.Mongo" Version="10.1.0" />
11-
<PackageReference Include="MongoDB.Bson" Version="3.4.0" />
12-
<PackageReference Include="MongoDB.Driver" Version="3.4.0" />
13-
<PackageReference Include="NUnit" Version="4.3.2" />
11+
<PackageReference Include="MongoDB.Bson" Version="3.5.0" />
12+
<PackageReference Include="MongoDB.Driver" Version="3.5.0" />
13+
<PackageReference Include="NUnit" Version="4.4.0" />
1414
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.4" />
1515
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.13.0" />
1616
<PackageReference Include="System.Text.Json" Version="9.0.6" />

‎FileService/FileService.Service/FileService.Service.csproj‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,14 @@
99
<ItemGroup>
1010
<PackageReference Include="AspNetCore.Identity.Mongo" Version="10.1.0" />
1111
<PackageReference Include="Minio" Version="6.0.5" />
12-
<PackageReference Include="MongoDB.Bson" Version="3.4.0" />
13-
<PackageReference Include="MongoDB.Driver" Version="3.4.0" />
14-
<PackageReference Include="NUnit" Version="4.3.2" />
12+
<PackageReference Include="MongoDB.Bson" Version="3.5.0" />
13+
<PackageReference Include="MongoDB.Driver" Version="3.5.0" />
14+
<PackageReference Include="NUnit" Version="4.4.0" />
1515
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.4" />
16+
<PackageReference Include="MongoDB.Bson" Version="3.5.0" />
17+
<PackageReference Include="MongoDB.Driver" Version="3.5.0" />
18+
<PackageReference Include="NUnit" Version="4.4.0" />
19+
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.0.0" />
1620
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.13.0" />
1721
<PackageReference Include="System.Text.Json" Version="9.0.6" />
1822
<PackageReference Include="Xabe.FFmpeg" Version="6.0.1" />

‎ai-service/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,26 @@
3434

3535
<!-- Spring / Cloud / AI -->
3636
<spring-cloud.version>2024.0.1</spring-cloud.version>
37-
<spring-grpc.version>0.8.0</spring-grpc.version>
37+
<spring-grpc.version>0.11.0</spring-grpc.version>
3838
<spring-ai.version>1.0.0</spring-ai.version>
3939

4040
<!-- gRPC & Protobuf -->
41-
<grpc.version>1.72.0</grpc.version>
42-
<protobuf.version>4.30.2</protobuf.version>
41+
<grpc.version>1.75.0</grpc.version>
42+
<protobuf.version>4.32.1</protobuf.version>
4343

4444
<!-- Library versions -->
45-
<lombok.version>1.18.38</lombok.version>
45+
<lombok.version>1.18.40</lombok.version>
4646
<mapstruct.version>1.6.3</mapstruct.version>
4747
<lombok.mapstruct.binding.version>0.2.0</lombok.mapstruct.binding.version>
4848
<jackson.version>2.19.0</jackson.version>
4949
<nimbus-jose.version>10.3</nimbus-jose.version>
50-
<security-oauth2-jose.version>6.5.0</security-oauth2-jose.version>
50+
<security-oauth2-jose.version>6.5.4</security-oauth2-jose.version>
5151
<jacoco.version>0.8.13</jacoco.version>
5252

5353
<!-- Build-plugin versions -->
5454
<protobuf.plugin.version>0.6.1</protobuf.plugin.version>
5555
<os.maven.plugin.version>1.7.1</os.maven.plugin.version>
56-
<maven.compiler.plugin.version>3.12.1</maven.compiler.plugin.version>
56+
<maven.compiler.plugin.version>3.14.0</maven.compiler.plugin.version>
5757
</properties>
5858
<dependencies>
5959

0 commit comments

Comments
 (0)