Skip to content

Commit d13abe6

Browse files
authored
[Chore] Improve owasp dependency check (apache#16305)
* improve owasp dependency check
1 parent 2db8098 commit d13abe6

File tree

4 files changed

+18
-8
lines changed

4 files changed

+18
-8
lines changed

Diff for: .github/workflows/backend.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
with:
6868
submodules: true
6969
- name: Set up JDK ${{ matrix.java }}
70-
uses: actions/setup-java@v2
70+
uses: actions/setup-java@v4
7171
with:
7272
java-version: ${{ matrix.java }}
7373
distribution: 'adopt'
@@ -160,7 +160,7 @@ jobs:
160160
version: ["3.1.9", "3.2.0"]
161161
steps:
162162
- name: Set up JDK 8
163-
uses: actions/setup-java@v2
163+
uses: actions/setup-java@v4
164164
with:
165165
java-version: 8
166166
distribution: 'adopt'

Diff for: .github/workflows/owasp-dependency-check.yaml

+12-3
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,36 @@ on:
2222
branches:
2323
- '[0-9]+.[0-9]+.[0-9]+-prepare'
2424
- '[0-9]+.[0-9]+.[0-9]+-release'
25-
pull_request:
25+
pull_request_target:
2626
paths:
2727
- '**/pom.xml'
2828
env:
2929
MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3
3030

3131
jobs:
3232
build:
33+
permissions:
34+
contents: read
35+
pull-requests: write
3336
runs-on: ubuntu-latest
3437
timeout-minutes: 120
3538
steps:
3639
- uses: actions/checkout@v4
3740
with:
3841
submodules: true
3942
- name: Set up JDK 8
40-
uses: actions/setup-java@v2
43+
uses: actions/setup-java@v4
4144
with:
4245
java-version: 8
4346
distribution: 'adopt'
4447
- name: Run OWASP Dependency Check
45-
run: ./mvnw -B clean install verify dependency-check:check -DskipDepCheck=false -Dmaven.test.skip=true -Dspotless.skip=true
48+
run: |
49+
./mvnw -B clean install verify dependency-check:check \
50+
-DskipDepCheck=false \
51+
-Dmaven.test.skip=true \
52+
-Dspotless.skip=true
53+
env:
54+
NIST_NVD_API_KEY: ${{ secrets.NIST_NVD_API_KEY }}
4655
- name: Upload report
4756
uses: actions/upload-artifact@v4
4857
if: ${{ cancelled() || failure() }}

Diff for: .github/workflows/unit-test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
with:
6767
token: ${{ secrets.GITHUB_TOKEN }}
6868
- name: Set up JDK ${{ matrix.java }}
69-
uses: actions/setup-java@v2
69+
uses: actions/setup-java@v4
7070
with:
7171
java-version: ${{ matrix.java }}
7272
distribution: 'adopt'
@@ -95,7 +95,7 @@ jobs:
9595
restore-keys: ${{ runner.os }}-maven-
9696
# Set up JDK 17 for SonarCloud.
9797
- name: Set up JDK 17
98-
uses: actions/setup-java@v2
98+
uses: actions/setup-java@v4
9999
with:
100100
java-version: 17
101101
distribution: 'adopt'

Diff for: pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<jacoco.skip>false</jacoco.skip>
8787
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
8888
<exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
89-
<owasp-dependency-check-maven.version>9.2.0</owasp-dependency-check-maven.version>
89+
<owasp-dependency-check-maven.version>10.0.2</owasp-dependency-check-maven.version>
9090
<lombok.version>1.18.20</lombok.version>
9191
<awaitility.version>4.2.0</awaitility.version>
9292
<truth.version>1.4.2</truth.version>
@@ -545,6 +545,7 @@
545545
<skipRuntimeScope>true</skipRuntimeScope>
546546
<skipSystemScope>true</skipSystemScope>
547547
<failBuildOnCVSS>7</failBuildOnCVSS>
548+
<nvdApiKeyEnvironmentVariable>NIST_NVD_API_KEY</nvdApiKeyEnvironmentVariable>
548549
</configuration>
549550
<executions>
550551
<execution>

0 commit comments

Comments
 (0)