Skip to content

Commit 97b345d

Browse files
authored
chore: dep updates (#175)
* chore: upgrade Node 24.15.0, consolidate Jackson to 3.x only * chore: bump deps, force patched plugin transitive deps - Jackson BOM 3.1.1 -> 3.1.2 - MongoDB driver 5.6.4 -> 5.6.5 - SnakeYAML 2.2 -> 2.6 - OWASP dependency-check plugin 12.2.0 -> 12.2.1 - Force plexus-utils 3.6.1 (CVE fix, via cyclonedx-gradle-plugin) - Force bcpg-jdk18on 1.84 (CVE fix, via dependency-check-gradle) * ci: re-introduce OWASP depcheck as primary Gradle CVE scan * ci: fix depcheck job - restore NVD cache, OSS index creds, timeout * ci: fix depcheck NVD cache key - use stable global key with save-always * ci: revert to grype for Gradle CVE scan, disable depcheck
1 parent a1d2bd4 commit 97b345d

7 files changed

Lines changed: 60 additions & 14 deletions

File tree

.github/workflows/ci.yml

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

2828
- uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # ratchet:actions/setup-node@v6
2929
with:
30-
node-version: '24.14.1'
30+
node-version: '24.15.0'
3131
cache: npm
3232
cache-dependency-path: git-proxy-java-dashboard/frontend/package-lock.json
3333

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
if: matrix.language == 'java-kotlin'
4040
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # ratchet:actions/setup-node@v6
4141
with:
42-
node-version: '24.14.1'
42+
node-version: '24.15.0'
4343
cache: npm
4444
cache-dependency-path: git-proxy-java-dashboard/frontend/package-lock.json
4545

.github/workflows/cve.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838

3939
grype-gradle:
4040
name: CVE / Gradle
41+
if: true
4142
runs-on: ubuntu-latest
4243
permissions:
4344
contents: read
@@ -77,3 +78,42 @@ jobs:
7778
name: sbom-gradle
7879
path: build/reports/cyclonedx/bom.json
7980
retention-days: 30
81+
82+
depcheck:
83+
name: CVE / Dependency Check (Gradle)
84+
if: false # disabled — NVD API reliability issues; re-enable when stable
85+
runs-on: ubuntu-latest
86+
permissions:
87+
contents: read
88+
steps:
89+
- name: Checkout
90+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # ratchet:actions/checkout@v6
91+
92+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # ratchet:actions/setup-java@v5
93+
with:
94+
distribution: temurin
95+
java-version: 21
96+
cache: gradle
97+
98+
- name: Cache NVD database
99+
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # ratchet:actions/cache@v5
100+
with:
101+
path: ~/.gradle/dependency-check-data/
102+
key: depcheck-db
103+
save-always: true
104+
105+
- name: Run OWASP Dependency Check
106+
timeout-minutes: 180
107+
env:
108+
NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
109+
OSS_INDEX_USERNAME: ${{ secrets.OSS_INDEX_USERNAME }}
110+
OSS_INDEX_TOKEN: ${{ secrets.OSS_INDEX_TOKEN }}
111+
run: ./gradlew dependencyCheckAggregate --info
112+
113+
- name: Upload report
114+
if: always()
115+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # ratchet:actions/upload-artifact@v7
116+
with:
117+
name: dependency-check-report
118+
path: ${{ github.workspace }}/build/reports/dependency-check*
119+
retention-days: 30

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ FROM docker.io/eclipse-temurin:21-jdk@sha256:06a4f4be86d459307036eb97c55a24686bd
66
# Install Node.js directly from the official distribution with SHA256 verification.
77
# To update: download the new tarball, verify against nodejs.org/dist/vX.Y.Z/SHASUMS256.txt,
88
# and update both NODE_VERSION and NODE_SHA256 below.
9-
ARG NODE_VERSION=24.14.1
10-
ARG NODE_SHA256_AMD64=ace9fa104992ed0829642629c46ca7bd7fd6e76278cb96c958c4b387d29658ea
11-
ARG NODE_SHA256_ARM64=734ff04fa7f8ed2e8a78d40cacf5ac3fc4515dac2858757cbab313eb483ba8a2
9+
ARG NODE_VERSION=24.15.0
10+
ARG NODE_SHA256_AMD64=44836872d9aec49f1e6b52a9a922872db9a2b02d235a616a5681b6a85fec8d89
11+
ARG NODE_SHA256_ARM64=73afc234d558c24919875f51c2d1ea002a2ada4ea6f83601a383869fefa64eed
1212
ARG TARGETARCH
1313
RUN case "${TARGETARCH}" in \
1414
arm64) NODE_ARCH=linux-arm64; NODE_SHA256="${NODE_SHA256_ARM64}" ;; \

build.gradle

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
1+
buildscript {
2+
configurations.configureEach {
3+
resolutionStrategy {
4+
force 'org.codehaus.plexus:plexus-utils:3.6.1'
5+
force 'org.bouncycastle:bcpg-jdk18on:1.84'
6+
}
7+
}
8+
}
9+
110
plugins {
211
id 'com.diffplug.spotless' version '8.4.0' apply false
3-
id 'org.owasp.dependencycheck' version '12.2.0'
12+
id 'org.owasp.dependencycheck' version '12.2.1'
413
id 'org.cyclonedx.bom' version '3.2.4'
514
id 'com.github.node-gradle.node' version '7.1.0' apply false
615
}
@@ -27,19 +36,18 @@ ext {
2736
hikariVersion = '7.0.2'
2837
h2Version = '2.4.240'
2938
postgresVersion = '42.7.10'
30-
mongoVersion = '5.6.4'
39+
mongoVersion = '5.6.5'
3140

3241
// Jackson
33-
jacksonBomVersion = '3.1.1'
34-
jacksonLegacyBomVersion = '2.18.6'
42+
jacksonBomVersion = '3.1.2'
3543

3644
// Spring
3745
springVersion = '7.0.6'
3846
springSecurityVersion = '7.0.4'
3947
springSessionVersion = '4.0.2'
4048

4149
// YAML
42-
snakeyamlVersion = '2.2'
50+
snakeyamlVersion = '2.6'
4351

4452
// Gestalt config
4553
gestaltVersion = '0.37.2'

git-proxy-java-server/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,7 @@ dependencies {
6262
implementation "com.github.gestalt-config:gestalt-core:${gestaltVersion}"
6363
implementation "com.github.gestalt-config:gestalt-yaml:${gestaltVersion}"
6464

65-
// Jackson BOM — keeps all Jackson modules in sync
66-
implementation platform("com.fasterxml.jackson:jackson-bom:${jacksonLegacyBomVersion}")
67-
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
65+
// Jackson BOM — inherited from core's api platform(); JSR310 support is built into databind 3.x
6866

6967
// Database drivers - include all so standalone Jetty server can use any backend
7068
runtimeOnly "com.h2database:h2:${h2Version}"

mise.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[tools]
22
java = "temurin-21"
3-
node = "24.14.1"
3+
node = "24.15.0"

0 commit comments

Comments
 (0)