Skip to content

Commit 63575bb

Browse files
nhumblotnhumblot
authored
Merge branch 'main' into dependabot/maven/io.github.jeremylong-open-vulnerability-clients-8.0.0
2 parents c597acc + d7b2a01 commit 63575bb

File tree

76 files changed

+2684
-1898
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+2684
-1898
lines changed

‎.github/ISSUE_TEMPLATE/false-positive-report.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ body:
66
- type: markdown
77
attributes:
88
value: |
9+
**Ensure you are using the latest version of dependency-check.**
10+
911
**Automation is used to process most false positives reports**; failure to follow these guidelines will delay the process:
1012
1113
- Only enter a **single (1) Package URL**.
@@ -27,15 +29,15 @@ body:
2729
id: cpe
2830
attributes:
2931
label: CPE
30-
description: Please enter the single Common Platform enumeration (CPE) as identified in the HTML Report. Only a **single CPE** can be specified. **Please put backtic characters around the CPE to ensure it displays correctly**.
32+
description: Please enter the single Common Platform enumeration (CPE) as identified in the HTML Report. Only a **single CPE** can be specified. **Please put backtick characters around the CPE to ensure it displays correctly**.
3133
placeholder: ex. `cpe:2.3:a:apache:log4j:2.12.1:*:*:*:*:*:*:*`
3234
validations:
3335
required: true
3436
- type: input
3537
id: cve
3638
attributes:
3739
label: CVE
38-
description: The vulnerability name as identified in the HTML Report. If specifying a CPE this is not necassary; if entered please enter only a **signle CVE**; if multiple CVE should be suppressed please enter multiple FP reports. This is optional and may not be needed as most FP reports are due to an incorrect CPE.
40+
description: The vulnerability name as identified in the HTML Report. If specifying a CPE this is not necessary; if entered please enter only a **single CVE**; if multiple CVE should be suppressed please enter multiple FP reports. This is optional and may not be needed as most FP reports are due to an incorrect CPE.
3941
placeholder: ex. CVE-2021-44228
4042
validations:
4143
required: false
@@ -66,4 +68,4 @@ body:
6668
label: Description
6769
description: Additional information regarding the false positive report.
6870
validations:
69-
required: false
71+
required: false

‎.github/workflows/build.yml‎

Lines changed: 39 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
- name: Install gpg secret key
2121
id: install-gpg-key
2222
run: |
23-
cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import
23+
cat <(echo -e "${{ secrets.GPG_PRIVATE_KEY }}") | gpg --batch --import
2424
gpg --list-secret-keys --keyid-format LONG
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626
- name: Check Maven Cache
2727
id: maven-cache
2828
uses: actions/cache@v4
@@ -43,28 +43,29 @@ jobs:
4343
with:
4444
path: core/target/data
4545
key: odc-data
46-
- uses: actions/setup-dotnet@v4.3.1
46+
- uses: actions/setup-dotnet@v5.0.0
4747
with:
4848
dotnet-version: '8.0.x'
4949
- name: Set up JDK 11
5050
id: jdk-11
51-
uses: actions/setup-java@v4
51+
uses: actions/setup-java@v5
5252
with:
5353
java-version: 11
5454
distribution: 'zulu'
55-
server-id: ossrh
56-
server-username: ${{ secrets.OSSRH_USERNAME }}
57-
server-password: ${{ secrets.OSSRH_TOKEN }}
55+
server-id: central
56+
server-username: ${{ secrets.CENTRAL_USER }}
57+
server-password: ${{ secrets.CENTRAL_PASSWORD }}
5858
- uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
5959
with:
6060
version: 6.0.2
6161
- name: Build Snapshot with Maven
6262
id: build-snapshot
6363
env:
64-
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
65-
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
64+
MAVEN_USERNAME: ${{ secrets.CENTRAL_USER }}
65+
MAVEN_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }}
66+
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PRIVATE_KEY_PASSWORD }}
6667
NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
67-
run: mvn -V -s settings.xml -Prelease clean package verify source:jar javadoc:jar gpg:sign deploy -DreleaseTesting --no-transfer-progress --batch-mode -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
68+
run: mvn -V -s settings.xml -Prelease clean package verify source:jar javadoc:jar gpg:sign deploy -DreleaseTesting --no-transfer-progress --batch-mode
6869
- name: SARIF Multitool
6970
uses: microsoft/[email protected]
7071
with:
@@ -100,20 +101,20 @@ jobs:
100101
ant/target/*.zip
101102
cli/target/*.zip
102103
103-
publish_coverage:
104-
name: publish code coverage reports
105-
runs-on: ubuntu-latest
106-
needs: build
107-
steps:
108-
- name: Download coverage reports
109-
uses: actions/download-artifact@v4
110-
with:
111-
name: code-coverage-report
112-
- name: Run codacy-coverage-reporter
113-
uses: codacy/codacy-coverage-reporter-action@master
114-
with:
115-
project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
116-
coverage-reports: utils/target/jacoco-results/jacoco.xml,core/target/jacoco-results/jacoco.xml,maven/target/jacoco-results/jacoco.xml,ant/target/jacoco-results/jacoco.xml,cli/target/jacoco-results/jacoco.xml
104+
# publish_coverage:
105+
# name: publish code coverage reports
106+
# runs-on: ubuntu-latest
107+
# needs: build
108+
# steps:
109+
# - name: Download coverage reports
110+
# uses: actions/download-artifact@v5
111+
# with:
112+
# name: code-coverage-report
113+
# - name: Run codacy-coverage-reporter
114+
# uses: codacy/codacy-coverage-reporter-action@master
115+
# with:
116+
# project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
117+
# coverage-reports: utils/target/jacoco-results/jacoco.xml,core/target/jacoco-results/jacoco.xml,maven/target/jacoco-results/jacoco.xml,ant/target/jacoco-results/jacoco.xml,cli/target/jacoco-results/jacoco.xml
117118

118119
docker:
119120
permissions:
@@ -127,7 +128,7 @@ jobs:
127128
DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
128129
steps:
129130
- name: Checkout code
130-
uses: actions/checkout@v4
131+
uses: actions/checkout@v5
131132
- name: Check Maven Cache
132133
id: maven-cache
133134
uses: actions/cache@v4
@@ -137,9 +138,21 @@ jobs:
137138
restore-keys: |
138139
${{ runner.os }}-maven-
139140
- name: Download release build
140-
uses: actions/download-artifact@v4
141+
uses: actions/download-artifact@v5
141142
with:
142143
name: archive-snapshot
144+
- name: Set up Docker
145+
uses: docker/setup-docker-action@v4
146+
with:
147+
daemon-config: |
148+
{
149+
"debug": true,
150+
"features": {
151+
"containerd-snapshotter": true
152+
}
153+
}
154+
- name: Set up Docker Buildx
155+
uses: docker/setup-buildx-action@v3
143156
- name: Build Docker Image
144157
run: ./build-docker.sh
145158
- name: build scan target

‎.github/workflows/codeql-analysis.yml‎

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

3434
steps:
3535
- name: Checkout repository
36-
uses: actions/checkout@v4
36+
uses: actions/checkout@v5
3737

3838
# Initializes the CodeQL tools for scanning.
3939
- name: Initialize CodeQL

‎.github/workflows/coverity.yml‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎.github/workflows/false-positive-approvals.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,20 @@ jobs:
1818
(github.event.comment.user.login == 'jeremylong' ||
1919
github.event.comment.user.login == 'aikebah' ||
2020
github.event.comment.user.login == 'nhumblot' ||
21+
github.event.comment.user.login == 'marcelstoer' ||
2122
github.event.comment.user.login == 'chadlwilson') }}
2223
runs-on: ubuntu-latest
2324
steps:
24-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2526
with:
2627
ref: generatedSuppressions
27-
- uses: actions/setup-node@v4.4.0
28+
- uses: actions/setup-node@v5.0.0
2829
- run: |
2930
npm install [email protected]
3031
npm install fs
3132
- name: Commit Suppression Rule
3233
id: fp-ops-commit
33-
uses: actions/github-script@v7.0.1
34+
uses: actions/github-script@v8.0.0
3435
with:
3536
script: |
3637
const { execSync } = require("child_process");
@@ -158,7 +159,7 @@ jobs:
158159
target-folder: suppressions
159160
- name: Message failure
160161
if: ${{ failure() || steps.fp-ops-commit.outputs.failed }}
161-
uses: actions/github-script@v7.0.1
162+
uses: actions/github-script@v8.0.0
162163
with:
163164
script: |
164165
github.rest.issues.createComment({

‎.github/workflows/false-positive-ops.yml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- name: Remove Labels
1717
if: contains(github.event.issue.labels.*.name, 'pending more information')
18-
uses: actions/github-script@v7.0.1
18+
uses: actions/github-script@v8.0.0
1919
with:
2020
script: |
2121
github.rest.issues.removeLabel({
@@ -32,7 +32,7 @@ jobs:
3232
repo: context.repo.repo
3333
})
3434
)
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v5
3636
with:
3737
path: odc
3838
- name: Parse False Positive Issue
@@ -41,7 +41,7 @@ jobs:
4141
with:
4242
issue-body: ${{ github.event.issue.body }}
4343
template-path: odc/.github/ISSUE_TEMPLATE/false-positive-report.yml
44-
- uses: actions/setup-node@v4.4.0
44+
- uses: actions/setup-node@v5.0.0
4545
with:
4646
node-version: 14
4747
- name: Initialize npm
@@ -50,7 +50,7 @@ jobs:
5050
npm install packageurl-js
5151
- name: Parse Package URL
5252
id: purl-parser
53-
uses: actions/github-script@v7.0.1
53+
uses: actions/github-script@v8.0.0
5454
env:
5555
PURL: ${{ fromJSON(steps.issue-parser.outputs.jsonString).purl }}
5656
with:
@@ -111,7 +111,7 @@ jobs:
111111
cd ..
112112
- name: Setup dotnet
113113
if: ${{ fromJSON(steps.purl-parser.outputs.result).type == 'nuget' }}
114-
uses: actions/setup-dotnet@v4.3.1
114+
uses: actions/setup-dotnet@v5.0.0
115115
with:
116116
dotnet-version: '8.0.x'
117117
- name: Setup dotnet fp-project
@@ -140,6 +140,8 @@ jobs:
140140
args: >
141141
--failOnCVSS 11
142142
--enableExperimental
143+
--ossIndexUsername ${{ secrets.OSS_INDEX_USERNAME }}
144+
--ossIndexPassword ${{ secrets.OSS_INDEX_API_TOKEN }}
143145
- name: Upload FP Report
144146
if: steps.check_files.outputs.files_exists == 'true'
145147
uses: actions/upload-artifact@v4
@@ -148,7 +150,7 @@ jobs:
148150
path: ${{github.workspace}}/reports
149151
- name: Comment on maven issue
150152
if: ${{ fromJSON(steps.purl-parser.outputs.result).type == 'maven' }}
151-
uses: actions/github-script@v7.0.1
153+
uses: actions/github-script@v8.0.0
152154
env:
153155
GROUPID: ${{ fromJSON(steps.purl-parser.outputs.result).namespace }}
154156
ARTIFACTID: ${{ fromJSON(steps.purl-parser.outputs.result).name }}
@@ -199,7 +201,7 @@ jobs:
199201
})
200202
- name: Comment on npm issue
201203
if: ${{ fromJSON(steps.purl-parser.outputs.result).type == 'npm' }}
202-
uses: actions/github-script@v7.0.1
204+
uses: actions/github-script@v8.0.0
203205
env:
204206
NAME: ${{ fromJSON(steps.purl-parser.outputs.result).name }}
205207
VERSION: ${{ fromJSON(steps.purl-parser.outputs.result).version }}
@@ -246,7 +248,7 @@ jobs:
246248
})
247249
- name: Comment on dotnet issue
248250
if: ${{ fromJSON(steps.purl-parser.outputs.result).type == 'nuget' }}
249-
uses: actions/github-script@v7.0.1
251+
uses: actions/github-script@v8.0.0
250252
env:
251253
NAME: ${{ fromJSON(steps.purl-parser.outputs.result).name }}
252254
VERSION: ${{ fromJSON(steps.purl-parser.outputs.result).version }}
@@ -293,7 +295,7 @@ jobs:
293295
294296
- name: Message failure
295297
if: ${{ failure() }}
296-
uses: actions/github-script@v7.0.1
298+
uses: actions/github-script@v8.0.0
297299
with:
298300
script: |
299301
github.rest.issues.createComment({

‎.github/workflows/lint-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
statuses: write
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: amannn/action-semantic-pull-request@v5.5.3
21+
- uses: amannn/action-semantic-pull-request@v6.1.1
2222
env:
2323
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ jobs:
1212
name: Publish Suppressions
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
with:
1717
ref: generatedSuppressions
18-
- uses: actions/setup-node@v4.4.0
18+
- uses: actions/setup-node@v5.0.0
1919
- run: |
2020
npm install fs
2121
- name: Create Generated Suppressions XML
22-
uses: actions/github-script@v7.0.1
22+
uses: actions/github-script@v8.0.0
2323
with:
2424
script: |
2525
const fs = require('fs');

0 commit comments

Comments
 (0)