Skip to content

Commit

Permalink
Merge branch 'main' into bumpSite
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremylong authored Dec 29, 2021
2 parents c2a09c0 + 20e6ddf commit f3a80f9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 2 additions & 0 deletions cli/src/main/java/org/owasp/dependencycheck/CliParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,8 @@ private void addAdvancedOptions(final Options options) {
"The path to the `go` executable."))
.addOption(newOptionWithArg(ARGUMENT.PATH_TO_YARN, "path",
"The path to the `yarn` executable."))
.addOption(newOptionWithArg(ARGUMENT.PATH_TO_PNPM, "path",
"The path to the `pnpm` executable."))
.addOption(newOptionWithArg(ARGUMENT.CVE_VALID_FOR_HOURS, "hours",
"The number of hours to wait before checking for new updates from the NVD."))
.addOption(newOptionWithArg(ARGUMENT.CVE_START_YEAR, "year",
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/resources/dependencycheck-base-suppression.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1867,10 +1867,11 @@
</suppress>
<suppress base="true">
<notes><![CDATA[
false positive per issue #1961
false positives per issue #1961 and #3918
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.gagravarr/vorbis\-java\-tika@.*$</packageUrl>
<cpe>cpe:/a:apache:tika</cpe>
<cpe>cpe:/a:flac_project:flac</cpe>
</suppress>
<suppress base="true">
<notes><![CDATA[
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ Copyright (c) 2012 - Jeremy Long
<apache.lucene.version>8.11.1</apache.lucene.version>
<apache.ant.version>1.10.12</apache.ant.version>
<slf4j.version>1.7.32</slf4j.version>
<logback.version>1.2.9</logback.version>
<logback.version>1.2.10</logback.version>
<!-- Note that Maven will use classes from the distro, ignoring declared dependencies for Maven core... -->
<maven.api.version>3.1.0</maven.api.version>
<reporting.checkstyle-plugin.version>3.1.2</reporting.checkstyle-plugin.version>
Expand Down

0 comments on commit f3a80f9

Please sign in to comment.