Merge branch '6.2.x'

Author: sbrannen

framework-api/framework-api.gradle

@@ -25,6 +25,7 @@ javadoc {
 	}))
 
 	title = "${rootProject.description} ${version} API"
+	failOnError = true
 	options {
 		encoding = "UTF-8"
 		memberLevel = JavadocMemberLevel.PROTECTED

gradle/spring-module.gradle

@@ -69,7 +69,7 @@ normalization {
 
 javadoc {
 	description = "Generates project-level javadoc for use in -javadoc jar"
-
+	failOnError = true
 	options {
 		encoding = "UTF-8"
 		memberLevel = JavadocMemberLevel.PROTECTED