From a36942aefd2ed8a4187e453c084595b2c3097642 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Mon, 20 Sep 2021 10:40:06 +0200
Subject: [PATCH] Refine Java 17 Javadoc configuration.

See #1537
---
 parent/pom.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index cb06c4a2..e86cf1b8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -339,6 +339,11 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
+						<configuration>
+							<javadocDirectory>${shared.resources}/javadoc</javadocDirectory>
+							<overview>${shared.resources}/javadoc/overview.html</overview>
+							<stylesheetfile>${shared.resources}/javadoc/spring-javadoc.css</stylesheetfile>
+						</configuration>
 						<executions>
 							<execution>
 								<id>aggregate-javadoc</id>
@@ -1191,18 +1196,13 @@
 					<header>${project.name}</header>
 					<source>${source.level}</source>
 					<quiet>true</quiet>
-					<javadocDirectory>${shared.resources}/javadoc</javadocDirectory>
-					<overview>${shared.resources}/javadoc/overview.html</overview>
-					<stylesheetfile>${shared.resources}/javadoc/spring-javadoc.css</stylesheetfile>
 					<!-- copies doc-files subdirectory which contains image resources -->
 					<docfilessubdirs>true</docfilessubdirs>
-					<additionalOptions>
-						<additionalOption>-Xdoclint:none</additionalOption>
-					</additionalOptions>
+					<doclint>html,reference</doclint>
 					<links>
 						<link>https://docs.spring.io/spring/docs/${spring}/javadoc-api/</link>
 						<link>https://docs.spring.io/spring-data/commons/docs/current/api/</link>
-						<link>https://docs.oracle.com/javase/8/docs/api/</link>
+						<link>https://docs.oracle.com/en/java/javase/17/docs/api/</link>
 					</links>
 				</configuration>
 			</plugin>