From c1f6a2ac0ffe48771dcbc9e4e9d88d23e1cd23d8 Mon Sep 17 00:00:00 2001
From: Martin Stockhammer <martin_s@apache.org>
Date: Wed, 22 Dec 2021 21:11:58 +0100
Subject: [PATCH] Fixing module doc configuration for new JDK

---
 archiva-modules/pom.xml | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml
index 26e5fb5c3..8b02dfa34 100644
--- a/archiva-modules/pom.xml
+++ b/archiva-modules/pom.xml
@@ -90,6 +90,24 @@
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <version>${maven-project-info-reports-plugin.version}</version>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.9.1</version>
+        <configuration>
+          <reportPlugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-javadoc-plugin</artifactId>
+              <version>${javadocPluginVersion}</version>
+              <configuration>
+                <doclint>none</doclint>
+                <additionalparam>-Xdoclint:none</additionalparam>
+              </configuration>
+            </plugin>
+          </reportPlugins>
+        </configuration>
+      </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -98,9 +116,9 @@
         <inherited>false</inherited>
         <configuration>
           <notimestamp>true</notimestamp>
-          <source>1.7</source>
+          <source>1.8</source>
           <links>
-            <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+            <link>https://docs.oracle.com/javase/8/docs/api/</link>
             <link>http://commons.apache.org/collections/apidocs-COLLECTIONS_3_0/</link>
             <link>http://commons.apache.org/dbcp/apidocs/</link>
             <link>http://commons.apache.org/fileupload/apidocs/</link>
@@ -114,6 +132,10 @@
           </links>
           <linksource>true</linksource>
           <show>private</show>
+          <doclint>none</doclint>
+          <additionalparam>
+             -Xdoclint:none
+          </additionalparam>
           <!--docletArtifact>
             <groupId>com.google.doclava</groupId>
             <artifactId>doclava</artifactId>
@@ -122,11 +144,12 @@
           <doclet>com.google.doclava.Doclava</doclet>
           <bootclasspath>${sun.boot.class.path}</bootclasspath>
           <additionalparam>
-
+             -Xdoclint:none
              -hdf project.name "${project.name}"
              -d ${project.build.directory}/site/apidocs
            </additionalparam>
           <useStandardDocletOptions>false</useStandardDocletOptions>
+          <doclint>none</doclint>
           <additionalJOption>-J-Xmx1024m</additionalJOption>
           <additionnalDependencies>
             <additionnalDependency>
-- 
2.39.5