Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build(deps): bump org.apache.maven.plugins:maven-site-plugin from 3.12.1 to 3.20.0 #6959

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

build(deps): bump org.apache.maven.plugins:maven-site-plugin from 3.12.1 to 3.20.0 #6959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2ba73a
build(deps): bump org.apache.maven.plugins:maven-site-plugin
dependabot[bot] Sep 11, 2024
9bcb1cf
fix: Also upgrade Fluido skin to 2.x as required by m-s-p v3.20.0
aikebah Sep 25, 2024
5911009
fix: use html5 tags
jeremylong Oct 8, 2024
513cbfb
build: update site
jeremylong Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ant/src/site/markdown/index.md.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Installation
3. Verify the cryptographic integrity of your download: `gpg --verify dependency-check-ant-${project.version}-release.zip.asc`.
4. Unzip the archive
5. Add the taskdef to your build.xml:

#[[
```xml
<!-- Set the value to the installation directory's path -->
<property name="dependency-check.home" value="C:/tools/dependency-check-ant"/>
Expand All @@ -26,6 +26,7 @@ Installation
<classpath refid="dependency-check.path" />
</taskdef>
```
]]#
6. Use the defined taskdefs:
* [dependency-check](configuration.html) - the primary task used to check the project dependencies.
* [dependency-check-purge](config-purge.html) - deletes the local copy of the NVD; this should rarely be used (if ever).
Expand Down
10 changes: 5 additions & 5 deletions ant/src/site/site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ limitations under the License.

Copyright (c) 2013 Jeremy Long. All Rights Reserved.
-->
<project name="dependency-check-ant">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="dependency-check-ant">
<bannerLeft>
<name>OWASP dependency-check-ant</name>
<alt>OWASP dependency-check-ant</alt>
<src>./images/dc-ant.svg</src>
<image alt="OWASP dependency-check-ant" src="./images/dc-ant.svg"/>
</bannerLeft>
<body>
<breadcrumbs>
Expand All @@ -32,4 +32,4 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
</menu>
<menu ref="reports" />
</body>
</project>
</site>
14 changes: 7 additions & 7 deletions archetype/src/site/site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ limitations under the License.

Copyright (c) 2017 Jeremy Long. All Rights Reserved.
-->
<project name="dependency-check-plugin">
<bannerLeft>
<name>OWASP dependency-check-plugin</name>
<alt>OWASP dependency-check-plugin</alt>
<src>/images/dc.svg</src>
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="dependency-check-plugin">
<bannerLeft>
<image alt="OWASP dependency-check-plugin" src="/images/dc.svg"/>
</bannerLeft>
<body>
<breadcrumbs>
Expand All @@ -29,6 +29,6 @@ Copyright (c) 2017 Jeremy Long. All Rights Reserved.
<menu name="Getting Started">
<item name="Usage" href="index.html"/>
</menu>
<menu ref="reports"/>
<menu ref="reports"/>
</body>
</project>
</site>
10 changes: 5 additions & 5 deletions cli/src/site/site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ limitations under the License.

Copyright (c) 2013 Jeremy Long. All Rights Reserved.
-->
<project name="dependency-check-cli">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="dependency-check-cli">
<bannerLeft>
<name>OWASP dependency-check-cli</name>
<alt>OWASP dependency-check-cli</alt>
<src>./images/dc-cli.svg</src>
<image alt="OWASP dependency-check-cli" src="./images/dc-cli.svg"/>
</bannerLeft>
<body>
<breadcrumbs>
Expand All @@ -32,4 +32,4 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
</menu>
<menu ref="reports" />
</body>
</project>
</site>
10 changes: 5 additions & 5 deletions core/src/site/site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ limitations under the License.

Copyright (c) 2012 Jeremy Long. All Rights Reserved.
-->
<project name="dependency-check-core">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="dependency-check-core">
<bannerLeft>
<name>OWASP dependency-check-core</name>
<alt>OWASP dependency-check-core</alt>
<src>./images/dc-core.svg</src>
<image alt="OWASP dependency-check-core" src="./images/dc-core.svg"/>
</bannerLeft>
<body>
<breadcrumbs>
Expand All @@ -31,4 +31,4 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
</menu>
<menu ref="reports" />
</body>
</project>
</site>
17 changes: 1 addition & 16 deletions maven/src/main/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,7 +917,7 @@ public abstract class BaseDependencyCheckMojo extends AbstractMojo implements Ma
@Parameter(property = "serverId")
private String serverId;
/**
* The NVD API Key. The parameters {@link #nvdApiKeyEnvironmentVariable} or {@link #nvdApiServerId} should be used instead otherwise
* The NVD API Key. The parameters {@link #nvdApiKeyEnvironmentVariable} or {@link #nvdApiServerId} should be used instead otherwise
* Maven debug logging could expose the API Key (see <a href="https://github.com/advisories/GHSA-qqhq-8r2c-c3f5">GHSA-qqhq-8r2c-c3f5</a>).
* This takes precedence over {@link #nvdApiServerId} and {@link #nvdApiKeyEnvironmentVariable}.
*/
Expand Down Expand Up @@ -1151,21 +1151,6 @@ public void execute() throws MojoExecutionException, MojoFailureException {
}
}

/**
* Generates the Dependency-Check Site Report.
*
* @param sink the sink to write the report to
* @param locale the locale to use when generating the report
* @throws MavenReportException if a maven report exception occurs
* @deprecated use
* {@link #generate(org.apache.maven.doxia.sink.Sink, java.util.Locale)}
* instead.
*/
@Deprecated
public final void generate(@SuppressWarnings("deprecation") org.codehaus.doxia.sink.Sink sink, Locale locale) throws MavenReportException {
generate((Sink) sink, locale);
}

/**
* Returns true if the Maven site is being generated.
*
Expand Down
11 changes: 5 additions & 6 deletions maven/src/site/site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,11 @@ limitations under the License.

Copyright (c) 2013 Jeremy Long. All Rights Reserved.
-->

<project name="dependency-check-maven" xmlns="http://maven.apache.org/DECORATION/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<site xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd"
name="dependency-check-maven">
<bannerLeft>
<name>OWASP dependency-check-maven</name>
<alt>OWASP dependency-check-maven</alt>
<src>./images/dc-maven.svg</src>
<image alt="OWASP dependency-check-maven" src="./images/dc-maven.svg" />
</bannerLeft>
<body>
<breadcrumbs>
Expand All @@ -34,4 +33,4 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
</menu>
<menu ref="reports"/>
</body>
</project>
</site>
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ Copyright (c) 2012 - Jeremy Long
<maven.api.version>3.6.3</maven.api.version>
<reporting.checkstyle-plugin.version>3.4.0</reporting.checkstyle-plugin.version>
<reporting.checkstyle.tool.version>9.3</reporting.checkstyle.tool.version>
<doxia-module-markdown.version>1.12.0</doxia-module-markdown.version>
<doxia-module-markdown.version>2.0.0</doxia-module-markdown.version>
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
<maven-dependency-plugin.version>3.7.1</maven-dependency-plugin.version>
<maven-javadoc-plugin.version>3.7.0</maven-javadoc-plugin.version>
Expand Down Expand Up @@ -160,7 +160,7 @@ Copyright (c) 2012 - Jeremy Long
<org.apache.maven.shared.file-management.version>3.1.0</org.apache.maven.shared.file-management.version>
<maven-plugin-testing-harness.version>3.3.0</maven-plugin-testing-harness.version>
<maven-plugin-annotations.version>3.13.1</maven-plugin-annotations.version>
<maven-reporting-api.version>3.1.1</maven-reporting-api.version>
<maven-reporting-api.version>4.0.0-M12</maven-reporting-api.version>
<org.apache.velocity.version>2.3</org.apache.velocity.version>
<plexus-sec-dispatcher.version>1.4</plexus-sec-dispatcher.version>
<maven-dependency-tree.version>3.3.0</maven-dependency-tree.version>
Expand Down Expand Up @@ -292,7 +292,7 @@ Copyright (c) 2012 - Jeremy Long
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.12.1</version>
<version>3.20.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/site/markdown/data/database.md.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Using a Database Server
=======================
<font color="red">**WARNING: This discusses an advanced setup and you may run into issues.**</font>
<p style="color:red">**WARNING: This discusses an advanced setup and you may run into issues.**</p>

Out of the box dependency-check uses a local H2 database. The location of the database
file is configured using the data directory configuration option (see
Expand Down
Loading
Loading