Skip to content

Commit b8c5533

Browse files
yumiokaclaude
andcommitted
Merge deps/tier1-tier2: verified Tier1+Tier2 breaking-major bumps
jakarta.annotation 3.0.0 (EE11), GH-Actions majors (checkout/setup-java/ upload-artifact/build-push/codeql-action), i18next 26, jsdom 29. Olingo 5.0 and Tier 3 (react-router 7 / antd 6 / netty 4.2 / solr-lucene 10) deferred. Gate: WAR build + vitest 191/191 + TCK 38/38 + Playwright g5 73/0. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2 parents 45ef7d4 + b365d48 commit b8c5533

11 files changed

Lines changed: 209 additions & 281 deletions

File tree

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ jobs:
3939
build-mode: none
4040
steps:
4141
- name: Checkout
42-
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
42+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
4343

4444
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@b7351df727350dca84cb9d725d57dcf5bc82ba26 # v3
45+
uses: github/codeql-action/init@7188fc363630916deb702c7fdcf4e481b751f97a # v4
4646
with:
4747
languages: ${{ matrix.language }}
4848
build-mode: ${{ matrix.build-mode }}
4949
config-file: ./.github/codeql/codeql-config.yml
5050

5151
- name: Perform CodeQL Analysis
52-
uses: github/codeql-action/analyze@b7351df727350dca84cb9d725d57dcf5bc82ba26 # v3
52+
uses: github/codeql-action/analyze@7188fc363630916deb702c7fdcf4e481b751f97a # v4
5353
with:
5454
category: "/language:${{ matrix.language }}"

.github/workflows/csrf-guards.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
runs-on: ubuntu-latest
4343
timeout-minutes: 5
4444
steps:
45-
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
45+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
4646
- name: CSRF header compliance
4747
run: ./scripts/check-csrf-headers.sh
4848
- name: Dockerfile server.xml parity
@@ -59,9 +59,9 @@ jobs:
5959
MAVEN_USERNAME: ${{ github.actor }}
6060
MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
6161
steps:
62-
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
62+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
6363
- name: Set up Java 21
64-
uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
64+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5
6565
with:
6666
distribution: temurin
6767
java-version: 21

.github/workflows/deploy-validate.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
name: Bootstrap scripts (bash + shellcheck)
3030
runs-on: ubuntu-latest
3131
steps:
32-
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
32+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
3333
- name: Syntax check
3434
run: |
3535
bash -n deploy/aws/user-data.sh
@@ -45,7 +45,7 @@ jobs:
4545
name: Production compose (docker compose config)
4646
runs-on: ubuntu-latest
4747
steps:
48-
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
48+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
4949
- name: Validate base + rag profiles
5050
working-directory: docker
5151
env:
@@ -84,7 +84,7 @@ jobs:
8484
name: Terraform modules (fmt + validate)
8585
runs-on: ubuntu-latest
8686
steps:
87-
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
87+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
8888
- uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3
8989
with:
9090
terraform_version: '1.9.8'

.github/workflows/gitleaks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
timeout-minutes: 15
3232
steps:
3333
- name: Checkout (full history)
34-
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
34+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
3535
with:
3636
fetch-depth: 0
3737

.github/workflows/integration-tests.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ jobs:
5353
COUCHDB_USER: admin
5454
COUCHDB_PASSWORD: password
5555
steps:
56-
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
57-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
56+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
57+
- uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5
5858
with:
5959
java-version: '21'
6060
distribution: 'temurin'
@@ -73,7 +73,7 @@ jobs:
7373
mvn test \
7474
-Dtest='ResourceBaseCsrfProtectionTest,CanonicalImportServiceTest,WebhookServiceTest,WebhookConfigTest,WebhookConfigParserTest,WebhookDeliveryServiceTest,HttpWebhookDispatcherTest,WebhookEventMatcherTest,ChildEventBatchProcessorTest,LiteralTypeValidatorTest,SolrPredicateWalkerMultilingualTest,NavigationPaginationTest,FilesystemImporterTest,ImportExportResourceTest,SlackConnectorAdapterTest,TeamsConnectorAdapterTest,ChatworkConnectorAdapterTest,MattermostConnectorAdapterTest,NotionConnectorAdapterTest,SalesforceConnectorAdapterTest,BoxDropboxAdapterTest' \
7575
-f core/pom.xml -Pdevelopment,opencmis-github-packages
76-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
76+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
7777
if: always()
7878
with: { name: unit-test-reports, path: core/target/surefire-reports/, retention-days: 7 }
7979

@@ -90,8 +90,8 @@ jobs:
9090
COUCHDB_USER: admin
9191
COUCHDB_PASSWORD: password
9292
steps:
93-
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
94-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
93+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
94+
- uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5
9595
with:
9696
java-version: '21'
9797
distribution: 'temurin'
@@ -128,7 +128,7 @@ jobs:
128128
-f core/pom.xml -Pdevelopment,opencmis-github-packages \
129129
-Dmaven.test.failure.ignore=false
130130
131-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
131+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
132132
if: always()
133133
with: { name: integration-reports, path: core/target/surefire-reports/, retention-days: 14 }
134134

@@ -152,8 +152,8 @@ jobs:
152152
COUCHDB_USER: admin
153153
COUCHDB_PASSWORD: password
154154
steps:
155-
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
156-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
155+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
156+
- uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5
157157
with:
158158
java-version: '21'
159159
distribution: 'temurin'
@@ -191,7 +191,7 @@ jobs:
191191
-f core/pom.xml -Pdevelopment,opencmis-github-packages \
192192
-Dmaven.test.failure.ignore=false
193193
194-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
194+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
195195
if: always()
196196
with: { name: tck-reports, path: core/target/surefire-reports/, retention-days: 14 }
197197

.github/workflows/playwright.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ jobs:
3636
COUCHDB_PASSWORD: password
3737

3838
steps:
39-
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
39+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
4040

4141
- name: Setup Java 21
42-
uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
42+
uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5
4343
with:
4444
java-version: '21'
4545
distribution: 'temurin'
@@ -115,15 +115,15 @@ jobs:
115115
run: npx playwright test --project=chromium --reporter=github
116116

117117
- name: Upload Playwright Report
118-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
118+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
119119
if: always()
120120
with:
121121
name: playwright-report
122122
path: core/src/main/webapp/ui/playwright-report/
123123
retention-days: 30
124124

125125
- name: Upload Test Results
126-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
126+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
127127
if: always()
128128
with:
129129
name: test-results

.github/workflows/release-images.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ jobs:
5555
version: ${{ steps.meta.outputs.version }}
5656
prefix: ${{ steps.meta.outputs.prefix }}
5757
steps:
58-
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
58+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
5959

60-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
60+
- uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5
6161
with:
6262
java-version: '21'
6363
distribution: 'temurin'
@@ -138,7 +138,7 @@ jobs:
138138
mvn -q org.cyclonedx:cyclonedx-maven-plugin:2.9.1:makeBom \
139139
-f core/pom.xml -Pdevelopment,opencmis-github-packages -DskipTests \
140140
-DoutputName=nemakiware-core-sbom -DoutputFormat=all
141-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
141+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
142142
with:
143143
name: sbom-cyclonedx
144144
path: |
@@ -179,7 +179,7 @@ jobs:
179179
echo "tags=${TAGS}" >> "$GITHUB_OUTPUT"
180180
181181
- name: Build core for scan (load, no push)
182-
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6
182+
uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7
183183
with:
184184
context: docker/core
185185
file: docker/core/Dockerfile.simple
@@ -203,7 +203,7 @@ jobs:
203203
nemakiware-core:scan || true
204204
205205
- name: Build & push core (with SBOM + provenance attestation)
206-
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6
206+
uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7
207207
with:
208208
context: docker/core
209209
file: docker/core/Dockerfile.simple
@@ -235,7 +235,7 @@ jobs:
235235
echo "tags=${TAGS}" >> "$GITHUB_OUTPUT"
236236
237237
- name: Build solr for scan (load, no push)
238-
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6
238+
uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7
239239
with:
240240
context: docker/solr
241241
file: docker/solr/Dockerfile
@@ -256,7 +256,7 @@ jobs:
256256
nemakiware-solr:scan || true
257257
258258
- name: Build & push solr (with SBOM + provenance attestation)
259-
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6
259+
uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7
260260
with:
261261
context: docker/solr
262262
file: docker/solr/Dockerfile
@@ -299,7 +299,7 @@ jobs:
299299
contents: read
300300
packages: read
301301
steps:
302-
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
302+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
303303
- name: Log in to GHCR
304304
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
305305
with:

.github/workflows/security-scan.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
runs-on: ubuntu-latest
7272
timeout-minutes: 10
7373
steps:
74-
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
74+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
7575
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
7676
with:
7777
node-version: '20'
@@ -87,7 +87,7 @@ jobs:
8787
if: always()
8888
working-directory: core/src/main/webapp/ui
8989
run: npm audit --json > ../../../../npm-audit.json || true
90-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
90+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
9191
if: always()
9292
with:
9393
name: npm-audit-report
@@ -105,8 +105,8 @@ jobs:
105105
MAVEN_USERNAME: ${{ github.actor }}
106106
MAVEN_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
107107
steps:
108-
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
109-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
108+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
109+
- uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5
110110
with:
111111
java-version: '21'
112112
distribution: 'temurin'
@@ -185,7 +185,7 @@ jobs:
185185
exit 1
186186
fi
187187
echo "✅ All dependency drift checks passed."
188-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
188+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
189189
if: always()
190190
with:
191191
name: maven-deps-tree
@@ -197,7 +197,7 @@ jobs:
197197
runs-on: ubuntu-latest
198198
timeout-minutes: 5
199199
steps:
200-
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
200+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
201201
- name: Scan for hardcoded credentials in compose / properties
202202
run: |
203203
set -e
@@ -248,7 +248,7 @@ jobs:
248248
runs-on: ubuntu-latest
249249
timeout-minutes: 5
250250
steps:
251-
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
251+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
252252
- name: Forbid the SolrCell /update/extract handler (XXE surface)
253253
# NemakiWare extracts document text application-side with Tika and posts
254254
# plain text via /update; the in-Solr ExtractingRequestHandler (SolrCell)
@@ -370,7 +370,7 @@ jobs:
370370
# Enforce the "construct XML parsers only via SecureXml" invariant so the
371371
# XXE hardening cannot drift or be dropped by a copy-pasted new sink.
372372
steps:
373-
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
373+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
374374
- name: Forbid raw XML parser construction outside SecureXml
375375
run: |
376376
set -e
@@ -393,7 +393,7 @@ jobs:
393393
# periodic re-review of accepted-but-unfixed advisories. Runs on the daily
394394
# schedule so an exception "expires into" a red check over time.
395395
steps:
396-
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
396+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
397397
- name: Fail on any expired risk-acceptance
398398
run: |
399399
python3 - <<'PY'
@@ -430,7 +430,7 @@ jobs:
430430
# fail the build. The exception-expiry job already hard-fails expired ones.
431431
continue-on-error: true
432432
steps:
433-
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
433+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
434434
- name: Install osv-scanner (pinned + checksum-verified)
435435
run: |
436436
set -euo pipefail
@@ -448,7 +448,7 @@ jobs:
448448
# their ignoreUntil date, at which point exception-expiry fails.
449449
run: |
450450
"$RUNNER_TEMP/osv-scanner" --config=osv-scanner.toml --recursive --skip-git --format table . | tee osv-report.txt
451-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
451+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
452452
if: always()
453453
with:
454454
name: osv-report
@@ -472,7 +472,7 @@ jobs:
472472
# informationally in release-images.yml.
473473
continue-on-error: true
474474
steps:
475-
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
475+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
476476
- name: Install Trivy (pinned; install.sh verifies the release checksum)
477477
run: |
478478
curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/v0.72.0/contrib/install.sh \
@@ -494,7 +494,7 @@ jobs:
494494
--format sarif \
495495
--output trivy-solr.sarif \
496496
nemakiware-solr:ci || true
497-
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
497+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
498498
if: always()
499499
with:
500500
name: trivy-solr-sarif

core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@
885885
<dependency>
886886
<groupId>jakarta.annotation</groupId>
887887
<artifactId>jakarta.annotation-api</artifactId>
888-
<version>2.1.1</version>
888+
<version>3.0.0</version>
889889
</dependency>
890890

891891
<!-- Jakarta EE JAXB dependencies -->

0 commit comments

Comments
 (0)