build(deps): bump org.apache.maven.plugins:maven-site-plugin from 3.1…

…2.1 to 3.20.0 (#6959) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Hans Aikema <[email protected]> Co-authored-by: Jeremy Long <[email protected]>
jeremylong · Oct 10, 2024 · 585016a · 585016a
1 parent 5c7b1b6
commit 585016a
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 158 deletions.
diff --git a/ant/src/site/markdown/index.md.vm b/ant/src/site/markdown/index.md.vm
@@ -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"/>
@@ -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).

diff --git a/ant/src/site/site.xml b/ant/src/site/site.xml
@@ -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>
@@ -32,4 +32,4 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
         </menu>
         <menu ref="reports" />
     </body>
-</project>
+</site>
diff --git a/archetype/src/site/site.xml b/archetype/src/site/site.xml
@@ -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>
@@ -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>
diff --git a/cli/src/site/site.xml b/cli/src/site/site.xml
@@ -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>
@@ -32,4 +32,4 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
         </menu>
         <menu ref="reports" />
     </body>
-</project>
+</site>
diff --git a/core/src/site/site.xml b/core/src/site/site.xml
@@ -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>
@@ -31,4 +31,4 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
         </menu>
         <menu ref="reports" />
     </body>
-</project>
+</site>
diff --git a/maven/src/main/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.java b/maven/src/main/java/org/owasp/dependencycheck/maven/BaseDependencyCheckMojo.java
@@ -1153,21 +1153,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.
      *

diff --git a/maven/src/site/site.xml b/maven/src/site/site.xml
@@ -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>
@@ -34,4 +33,4 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
         </menu>
         <menu ref="reports"/>
     </body>
-</project>
+</site>
diff --git a/pom.xml b/pom.xml
@@ -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.8.0</maven-dependency-plugin.version>
         <maven-javadoc-plugin.version>3.10.0</maven-javadoc-plugin.version>
@@ -161,7 +161,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>
@@ -293,7 +293,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>

diff --git a/src/site/markdown/data/database.md.vm b/src/site/markdown/data/database.md.vm
@@ -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