Skip to content

Commit 6163ca5

Browse files
Khaled Salhabclaude
authored andcommitted
chore: merge main into migrate/vite-6 - resolve conflicts
Resolved conflicts: - .github/workflows/ci.yml: Updated actions/checkout from v4 to v6 - pom.xml: Merged OWASP dependency-check-maven update - package.json: Kept our testing infrastructure - package-lock.json: Regenerated after merge - vite.config.ts: Kept our test configuration All conflicts resolved in favor of keeping testing infrastructure while adopting dependency updates from main. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2 parents 2449b3f + 55824be commit 6163ca5

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
backend: ${{ steps.filter.outputs.backend }}
1717
frontend: ${{ steps.filter.outputs.frontend }}
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v6
2020

2121
- uses: dorny/paths-filter@v3
2222
id: filter
@@ -51,7 +51,6 @@ jobs:
5151
JWT_SECRET: test_jwt_secret_key_for_ci_environments_only_do_not_use_in_production
5252

5353
steps:
54-
- uses: actions/checkout@v4
5554

5655
- name: Set up JDK 25
5756
uses: actions/setup-java@v5
@@ -101,10 +100,10 @@ jobs:
101100
working-directory: coupon-system-frontend
102101

103102
steps:
104-
- uses: actions/checkout@v4
103+
- uses: actions/checkout@v6
105104

106105
- name: Set up Node.js 20
107-
uses: actions/setup-node@v4
106+
uses: actions/setup-node@v6
108107
with:
109108
node-version: '20'
110109
cache: 'npm'
@@ -142,7 +141,7 @@ jobs:
142141
JWT_SECRET: test_jwt_secret_key_for_ci_environments_only_do_not_use_in_production
143142

144143
steps:
145-
- uses: actions/checkout@v4
144+
- uses: actions/checkout@v6
146145

147146
- name: Set up JDK 25
148147
uses: actions/setup-java@v5
@@ -191,10 +190,10 @@ jobs:
191190
working-directory: coupon-system-frontend
192191

193192
steps:
194-
- uses: actions/checkout@v4
193+
- uses: actions/checkout@v6
195194

196195
- name: Set up Node.js 20
197-
uses: actions/setup-node@v4
196+
uses: actions/setup-node@v6
198197
with:
199198
node-version: '20'
200199
cache: 'npm'
@@ -229,7 +228,7 @@ jobs:
229228
if: github.ref == 'refs/heads/main' && needs.detect-changes.outputs.backend == 'true'
230229

231230
steps:
232-
- uses: actions/checkout@v4
231+
- uses: actions/checkout@v6
233232

234233
- name: Set up JDK 25
235234
uses: actions/setup-java@v5

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
<plugin>
163163
<groupId>org.owasp</groupId>
164164
<artifactId>dependency-check-maven</artifactId>
165-
<version>12.1.3</version>
165+
<version>12.2.0</version>
166166
<configuration>
167167
<!-- Skip by default for faster local builds -->
168168
<!-- Run with: mvn verify -Dowasp.skip=false -->

0 commit comments

Comments
 (0)