From dc5c5702f8b2e3019516631fd7d4cff2e79ea478 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Fri, 28 Jun 2019 21:16:27 -0700
Subject: [PATCH] Enforce stricter javadoc @Since rules

See gh-17360
---
 spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml | 1 +
 spring-boot-parent/src/checkstyle/checkstyle.xml              | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml b/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
index d2deda4063c..96a7accdfd9 100644
--- a/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
+++ b/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
@@ -28,4 +28,5 @@
 	<suppress files="Rating\.java" checks="JavadocVariable" />
 	<suppress files="Direction\.java" checks="JavadocVariable" />
 	<suppress files="JooqExamples\.java" checks="AvoidStaticImport"/>
+	<suppress files="[\\/]spring-boot-docs[\\/]" checks="SpringJavadoc" message="\@since" />
 </suppressions>
diff --git a/spring-boot-parent/src/checkstyle/checkstyle.xml b/spring-boot-parent/src/checkstyle/checkstyle.xml
index 7eba2cff9e0..602c6b9fe24 100644
--- a/spring-boot-parent/src/checkstyle/checkstyle.xml
+++ b/spring-boot-parent/src/checkstyle/checkstyle.xml
@@ -7,5 +7,9 @@
 			<property name="illegalPkgs" value="sun, org.apache.commons.(?!codec|dbcp|dbcp2|logging|pool|pool2).*, com.google.common.(?!cache).*, org.flywaydb.core.internal"/>
 			<property name="regexp" value="true"/>
 		</module>
+		<module name="io.spring.javaformat.checkstyle.check.SpringJavadocCheck">
+			<property name="publicOnlySinceTags" value="true" />
+			<property name="requireSinceTag" value="true" />
+		</module>
 	</module>
 </module>