From 78432fc7451ddd025f53c9d79908f0dc0d219cd9 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Mon, 19 Jan 2015 11:32:03 +0000
Subject: [PATCH] Disable javadoc linting when building with JDK 8+
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Java 8 introduced new, aggressive linting of javadoc that’s enabled by
default. The linter isn’t sufficiently configurable to allow us to tune
it to meet the project’s conventions for javadoc so our only realistic
option is to disable linting.

This commit introduces a new profile to disable javadoc linting. To
maintain compatibility with JDK 7, the profile is only active when the
build’s running on JDK 8 or later.

Closes gh-2233
---
 spring-boot-parent/pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml
index fbe319d2c8f..79ce42570a8 100644
--- a/spring-boot-parent/pom.xml
+++ b/spring-boot-parent/pom.xml
@@ -572,6 +572,9 @@
 									<goal>jar</goal>
 								</goals>
 								<inherited>true</inherited>
+								<configuration>
+									<additionalparam>${javadoc.opts}</additionalparam>
+								</configuration>
 							</execution>
 						</executions>
 					</plugin>
@@ -588,6 +591,15 @@
 				</pluginRepository>
 			</pluginRepositories>
 		</profile>
+		<profile>
+			<id>disable-java8-doclint</id>
+			<activation>
+				<jdk>[1.8,)</jdk>
+			</activation>
+			<properties>
+				<javadoc.opts>-Xdoclint:none</javadoc.opts>
+			</properties>
+		</profile>
 		<profile>
 			<id>snapshot</id>
 		</profile>