Skip to content

Commit 5bddfab

Browse files
committed
Dependency updates and add OWASP check
1 parent c9b552a commit 5bddfab

File tree

6 files changed

+73
-3
lines changed

6 files changed

+73
-3
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ updates:
99
directory: "/" # Location of package manifests
1010
schedule:
1111
interval: "daily"
12+
- package-ecosystem: "github-actions"
13+
directory: "/"
14+
schedule:
15+
interval: "daily"

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: Build
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
with:
1515
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
1616
- name: Set up JDK

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
VERSION=${GITHUB_REF_NAME#v}
1919
echo "VERSION=$VERSION" >> $GITHUB_ENV
2020
echo "IMAGE_NAME=${{ env.REGISTRY }}/${{ env.BASE_IMAGE_NAME }}:$VERSION" >> $GITHUB_ENV
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222
with:
2323
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
2424
- name: Set up JDK

dependency-check-suppression.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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><![CDATA[
5+
This CVE does not apply because the POM verifies a Maven version that is not affected.
6+
]]></notes>
7+
<packageUrl regex="true">^pkg:maven/org\.apache\.maven/maven-artifact-manager@.*$</packageUrl>
8+
<vulnerabilityName>CVE-2021-26291</vulnerabilityName>
9+
</suppress>
10+
<suppress>
11+
<notes><![CDATA[
12+
This CVE does not apply because the utility is only used to read project files at build time.
13+
]]></notes>
14+
<packageUrl regex="true">^pkg:maven/org\.codehaus\.plexus/plexus-utils@.*$</packageUrl>
15+
<vulnerabilityName>CVE-2017-1000487</vulnerabilityName>
16+
</suppress>
17+
<suppress>
18+
<notes><![CDATA[
19+
This CVE does not apply because this CVE refers to an unrelated project.
20+
]]></notes>
21+
<packageUrl regex="true">^pkg:maven/io\.netty/netty-handler@.*$</packageUrl>
22+
<vulnerabilityName>CVE-2023-4586</vulnerabilityName>
23+
</suppress>
24+
</suppressions>

owaspDependencyCheck.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
# Copyright (c) 2020, 2021, Oracle and/or its affiliates.
3+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
4+
5+
# Generate report of known issues in dependencies
6+
7+
set -e
8+
9+
mvn ${MAVEN_ARGS} -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN org.owasp:dependency-check-maven:aggregate

pom.xml

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,12 @@
6060
<maven-war-plugin-version>3.4.0</maven-war-plugin-version>
6161
<maven-resources-plugin-version>3.3.1</maven-resources-plugin-version>
6262
<maven-dependency-plugin-version>3.6.0</maven-dependency-plugin-version>
63+
<dependency-check-version>8.4.0</dependency-check-version>
64+
65+
<skip.dependency-check>false</skip.dependency-check>
6366

6467
<java.version.range>17</java.version.range>
65-
<maven.version.range>[3.6.1,)</maven.version.range>
68+
<maven.version.range>[3.8.1,)</maven.version.range>
6669
</properties>
6770

6871
<build>
@@ -142,6 +145,11 @@
142145
<useModulePath>false</useModulePath>
143146
</configuration>
144147
</plugin>
148+
<plugin>
149+
<groupId>org.owasp</groupId>
150+
<artifactId>dependency-check-maven</artifactId>
151+
<version>${dependency-check-version}</version>
152+
</plugin>
145153
<plugin>
146154
<groupId>org.jacoco</groupId>
147155
<artifactId>jacoco-maven-plugin</artifactId>
@@ -240,6 +248,26 @@
240248
<artifactId>maven-deploy-plugin</artifactId>
241249
<version>${maven-deploy-plugin-version}</version>
242250
</plugin>
251+
252+
<plugin>
253+
<groupId>org.owasp</groupId>
254+
<artifactId>dependency-check-maven</artifactId>
255+
<version>${dependency-check-version}</version>
256+
<configuration>
257+
<skip>${skip.dependency-check}</skip>
258+
<skipTestScope>true</skipTestScope>
259+
<failBuildOnCVSS>0</failBuildOnCVSS>
260+
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
261+
<formats>
262+
<format>HTML</format>
263+
<format>CSV</format>
264+
</formats>
265+
<suppressionFiles>
266+
<suppressionFile>dependency-check-suppression.xml</suppressionFile>
267+
</suppressionFiles>
268+
</configuration>
269+
</plugin>
270+
243271
</plugins>
244272
</build>
245273

@@ -281,6 +309,11 @@
281309
<artifactId>commons-io</artifactId>
282310
<version>2.13.0</version>
283311
</dependency>
312+
<dependency>
313+
<groupId>io.netty</groupId>
314+
<artifactId>netty-handler</artifactId>
315+
<version>4.1.97.Final</version>
316+
</dependency>
284317

285318
<!-- unit test dependencies -->
286319

0 commit comments

Comments
 (0)