From 76e5f5f1b967317c5f09bebec6f1d2c3c037b740 Mon Sep 17 00:00:00 2001
From: "Mark S. Lewis" <mark_lewis@uk.ibm.com>
Date: Fri, 7 Jan 2022 14:59:44 +0000
Subject: [PATCH] Fix Javadoc build for Java 8

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
---
 pom.xml | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2e6c1d2d..aac48235 100644
--- a/pom.xml
+++ b/pom.xml
@@ -248,7 +248,7 @@
                     </links>
                     <source>${javaVersion}</source>
                     <additionalJOptions>
-                        <additionalJOption>--no-module-directories</additionalJOption>
+                        <additionalJOption>${additionalJavadocOpts}</additionalJOption>
                     </additionalJOptions>
                 </configuration>
                 <executions>
@@ -314,7 +314,13 @@
                     <plugin>
                         <groupId>org.owasp</groupId>
                         <artifactId>dependency-check-maven</artifactId>
-                        <version>3.2.0</version>
+                        <version>6.5.2</version>
+                        <configuration>
+                            <skipProvidedScope>true</skipProvidedScope>
+                            <skipTestScope>true</skipTestScope>
+                            <skipSystemScope>true</skipSystemScope>
+                            <failBuildOnCVSS>7</failBuildOnCVSS>
+                        </configuration>
                         <executions>
                             <execution>
                                 <goals>
@@ -323,10 +329,17 @@
                             </execution>
                         </executions>
                     </plugin>
-
                 </plugins>
             </build>
-
+        </profile>
+        <profile>
+            <id>javadoc-no-module-directories</id>
+            <activation>
+                <jdk>[11,)</jdk>
+            </activation>
+            <properties>
+                <additionalJavadocOpts>--no-module-directories</additionalJavadocOpts>
+            </properties>
         </profile>
         <profile>
             <id>release</id>
@@ -407,7 +420,7 @@
                             </links>
                             <source>${javaVersion}</source>
                             <additionalJOptions>
-                                <additionalJOption>--no-module-directories</additionalJOption>
+                                <additionalJOption>${additionalJavadocOpts}</additionalJOption>
                             </additionalJOptions>
                         </configuration>
                         <executions>