Skip to content

Commit f69e3c6

Browse files
DavidDamkeddamkeDeath111
authored
Feature/add dependency check in pipeline (#129)
* add dependency check to pipeline * updated dependency check to 8.0.2. fixed mvn site. added additional vulnerability suppression --------- Co-authored-by: ddamke <[email protected]> Co-authored-by: Nico <[email protected]>
1 parent 69a0a8d commit f69e3c6

File tree

3 files changed

+72
-24
lines changed

3 files changed

+72
-24
lines changed

.github/workflows/mavenCi.yml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414

1515
jobs:
1616

17-
Analyze_Build_Upload:
17+
build-analyze:
1818

1919
runs-on: ubuntu-latest
2020

@@ -30,15 +30,14 @@ jobs:
3030
java-version: '11'
3131
distribution: 'corretto'
3232
cache: maven
33-
34-
# Initializes the CodeQL tools for scanning.
33+
3534
- name: Initialize CodeQL
3635
uses: github/codeql-action/init@v2
3736
with:
3837
languages: 'java'
39-
38+
4039
- name: Build
41-
run: mvn -V -B clean verify org.jacoco:jacoco-maven-plugin:0.8.7:prepare-agent org.jacoco:jacoco-maven-plugin:0.8.7:report -Pcoverage -Dproject.version=${{ env.version }}-SNAPSHOT
40+
run: mvn -V -B clean package org.jacoco:jacoco-maven-plugin:0.8.7:prepare-agent org.jacoco:jacoco-maven-plugin:0.8.7:report -Pcoverage
4241

4342
- name: Upload Build Artifact
4443
uses: actions/upload-artifact@v3
@@ -59,3 +58,20 @@ jobs:
5958

6059
- name: Perform CodeQL Analysis
6160
uses: github/codeql-action/analyze@v2
61+
62+
dependency-check:
63+
64+
runs-on: ubuntu-latest
65+
66+
steps:
67+
- uses: actions/checkout@v3
68+
69+
- name: Set up JDK 11
70+
uses: actions/setup-java@v3
71+
with:
72+
java-version: '11'
73+
distribution: 'corretto'
74+
cache: maven
75+
76+
- name: dependencyCheck
77+
run: mvn dependency-check:check
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
3+
<suppress>
4+
<notes>
5+
<![CDATA[
6+
file name: maven-core-3.0.jar
7+
suppression-reason: referenced from 'maven-assembly-plugin' which is executed in build step (no runtime vulnerability). no assembly-plugin update available.
8+
]]>
9+
</notes>
10+
<packageUrl regex="true">^pkg:maven/org\.apache\.maven/maven\-core@.*$</packageUrl>
11+
<cve>CVE-2021-26291</cve>
12+
</suppress>
13+
<suppress>
14+
<notes>
15+
<![CDATA[
16+
file name: maven-settings-3.0.jar
17+
suppression-reason: referenced from 'maven-assembly-plugin' which is executed in build step (no runtime vulnerability). no assembly-plugin update available.
18+
]]>
19+
</notes>
20+
<packageUrl regex="true">^pkg:maven/org\.apache\.maven/maven\-settings@.*$</packageUrl>
21+
<vulnerabilityName>CVE-2021-26291</vulnerabilityName>
22+
</suppress>
23+
<suppress>
24+
<notes>
25+
<![CDATA[
26+
file name: snakeyaml-1.30.jar
27+
suppression-reason: we are not using .yaml files
28+
]]>
29+
</notes>
30+
<packageUrl regex="true">^pkg:maven/org\.yaml/snakeyaml@.*$</packageUrl>
31+
<cve>CVE-2022-1471</cve>
32+
</suppress>
33+
</suppressions>

pom.xml

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<maven.compiler.source>11</maven.compiler.source>
3939
<maven.compiler.target>11</maven.compiler.target>
4040

41-
<maven-dependency-check.version>6.0.5</maven-dependency-check.version>
41+
<maven-dependency-check.version>8.0.2</maven-dependency-check.version>
4242
<!-- USING HTML,XML (comma-separated list) did not work with plugin version 5.1.0 -->
4343
<maven-dependency-check.format>ALL</maven-dependency-check.format>
4444
<maven-dependency-check.failOnError>true</maven-dependency-check.failOnError>
@@ -187,8 +187,14 @@
187187
</executions>
188188
</plugin>
189189

190-
<!-- see https://jeremylong.github.io/DependencyCheck/dependency-check-maven/ -->
191-
<!-- https://mvnrepository.com/artifact/org.owasp/dependency-check-maven -->
190+
<!-- needed for mvn site - see https://stackoverflow.com/a/51099913 -->
191+
<plugin>
192+
<groupId>org.apache.maven.plugins</groupId>
193+
<artifactId>maven-site-plugin</artifactId>
194+
<version>3.12.1</version>
195+
</plugin>
196+
197+
<!-- https://mvnrepository.com/artifact/org.owasp/dependency-check-maven (run with mvn dependency-check:check ) -->
192198
<plugin>
193199
<groupId>org.owasp</groupId>
194200
<artifactId>dependency-check-maven</artifactId>
@@ -198,31 +204,24 @@
198204
<failOnError>${maven-dependency-check.failOnError}</failOnError>
199205
<failBuildOnCVSS>${maven-dependency-check.failBuildOnCVSS}</failBuildOnCVSS>
200206
<outputDirectory>target/site</outputDirectory>
201-
<!--suppressionFile>${project.basedir}/dependency-check-report_suppressions.xml</suppressionFile -->
207+
<suppressionFile>dependency-check-report_suppressions.xml</suppressionFile>
202208
</configuration>
203209
<executions>
204-
<execution>
205-
<goals>
206-
<goal>update-only</goal>
207-
</goals>
208-
</execution>
210+
<execution>
211+
<goals>
212+
<goal>check</goal>
213+
</goals>
214+
</execution>
209215
</executions>
210216
</plugin>
211-
212217
</plugins>
213218
</build>
214219

220+
<!-- generate site with mvn site (including dependency check) -->
215221
<reporting>
216222
<plugins>
217-
<!-- needed for mvn site - see https://stackoverflow.com/a/51099913 -->
218-
<plugin>
219-
<groupId>org.apache.maven.plugins</groupId>
220-
<artifactId>maven-site-plugin</artifactId>
221-
<version>3.12.1</version>
222-
</plugin>
223-
224223
<plugin>
225-
<!-- https://mvnrepository.com/artifact/org.owasp/dependency-check-maven -->
224+
<!-- https://mvnrepository.com/artifact/org.owasp/dependency-check-maven (redefinition to run also with site) -->
226225
<groupId>org.owasp</groupId>
227226
<artifactId>dependency-check-maven</artifactId>
228227
<version>${maven-dependency-check.version}</version>
@@ -238,7 +237,7 @@
238237
<failOnError>${maven-dependency-check.failOnError}</failOnError>
239238
<failBuildOnCVSS>${maven-dependency-check.failBuildOnCVSS}</failBuildOnCVSS>
240239
<outputDirectory>target/site</outputDirectory>
241-
<!--suppressionFile>${project.basedir}/dependency-check-report_suppressions.xml</suppressionFile -->
240+
<suppressionFile>dependency-check-report_suppressions.xml</suppressionFile>
242241
</configuration>
243242
</plugin>
244243
</plugins>

0 commit comments

Comments
 (0)