From 3da2a88f16265ee2ef0eb81a9327a39baf91fb3f Mon Sep 17 00:00:00 2001
From: Maxim Nesen <maxim.nesen@oracle.com>
Date: Thu, 3 Sep 2020 10:20:06 +0200
Subject: [PATCH] Updating maven-javadoc-pugin to 3.2.0

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
---
 connectors/helidon-connector/pom.xml  |  1 +
 examples/extended-wadl-webapp/pom.xml | 37 ++++++++++++++++++++++++++-
 pom.xml                               | 11 ++++----
 3 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/connectors/helidon-connector/pom.xml b/connectors/helidon-connector/pom.xml
index 9cdbb8dfff..d6ae02d8d2 100644
--- a/connectors/helidon-connector/pom.xml
+++ b/connectors/helidon-connector/pom.xml
@@ -78,6 +78,7 @@
                <artifactId>maven-javadoc-plugin</artifactId>
                <configuration>
                     <source>8</source>
+                   <detectJavaApiLink>false</detectJavaApiLink>
                </configuration>
             </plugin>
         </plugins>
diff --git a/examples/extended-wadl-webapp/pom.xml b/examples/extended-wadl-webapp/pom.xml
index cbe209c0ca..90b9499d05 100644
--- a/examples/extended-wadl-webapp/pom.xml
+++ b/examples/extended-wadl-webapp/pom.xml
@@ -207,7 +207,18 @@
                          version 2.5 of the javadoc plugin which will be used
                          by a maven version > 2.0.9 -->
                     <useStandardDocletOptions>false</useStandardDocletOptions>
-                    <additionalparam>-output ${project.build.outputDirectory}/resourcedoc.xml</additionalparam>
+                    <additionalOptions>
+                        <additionalOption>-output</additionalOption>
+                        <additionalOption>${project.build.outputDirectory}/resourcedoc.xml</additionalOption>
+                    </additionalOptions>
+                    <additionalDependencies>
+                        <additionalDependency>
+                            <groupId>com.sun.xml.bind</groupId>
+                            <artifactId>jaxb-osgi</artifactId>
+                            <version>${jaxb.ri.version}</version>
+                        </additionalDependency>
+                    </additionalDependencies>
+<!--                    <additionalparam>-output ${project.build.outputDirectory}/resourcedoc.xml</additionalparam>-->
                 </configuration>
             </plugin>
             <plugin>
@@ -246,6 +257,30 @@
                 </dependency>
             </dependencies>
         </profile>
+        <profile>
+            <id>javadocAndTestsSkipJDK13</id>
+            <activation>
+                <jdk>[13,)</jdk>
+            </activation>
+            <build>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <configuration>
+                        <skip>true</skip>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <configuration>
+                        <skip>true</skip>
+                    </configuration>
+                </plugin>
+            </plugins>
+            </build>
+        </profile>
         <profile>
             <id>pre-release</id>
             <build>
diff --git a/pom.xml b/pom.xml
index 929949f62f..22895fa187 100644
--- a/pom.xml
+++ b/pom.xml
@@ -445,7 +445,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.10.4</version>
+                    <version>3.2.0</version>
                     <configuration>
                         <doctitle>Jersey ${jersey.version} API Documentation</doctitle>
                         <windowtitle>Jersey ${jersey.version} API</windowtitle>
@@ -457,7 +457,7 @@
                         </bottom>
                         <links>
                             <link>https://jax-rs.github.io/apidocs/2.1/</link>
-                            <link>http://hk2.java.net/nonav/hk2-api/apidocs</link>
+                            <link>https://javaee.github.io/hk2/apidocs/</link>
                         </links>
                         <excludePackageNames>
                             *.internal.*:*.tests.*
@@ -467,8 +467,9 @@
                             <fileExclude>module-info.java</fileExclude>
                         </sourceFileExcludes>
                         <verbose>true</verbose>
-                        <additionalparam>-Xdoclint:none</additionalparam>
+                        <doclint>none</doclint>
                         <maxmemory>256m</maxmemory>
+                        <source>8</source>
                     </configuration>
                     <executions>
                         <execution>
@@ -1386,7 +1387,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
+                <version>3.2.0</version>
                 <!-- Run this plugin report sets only in the main Jersey pom -->
                 <inherited>false</inherited>
                 <configuration>
@@ -1405,7 +1406,7 @@
                         <link>https://jax-rs.github.io/apidocs/2.1</link>
                         <link>https://javaee.github.io/hk2/apidocs/</link>
                     </links>
-                    <additionalparam>-Xdoclint:none</additionalparam>
+                    <doclint>none</doclint>
                     <sourceFileExcludes>
                         <fileExclude>module-info.java</fileExclude>
                     </sourceFileExcludes>