diff --git a/pom.xml b/pom.xml
index bca2ca853..1cc18a6f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -255,7 +255,7 @@
 
 		<!-- Until we switch it to true in sc-build -->
 		<javadoc.failOnError>true</javadoc.failOnError>
-		<javadoc.failOnWarning>true</javadoc.failOnWarning>
+		<javadoc.failOnWarnings>true</javadoc.failOnWarnings>
 	</properties>
 
 	<profiles>
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TracingChannelInterceptor.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TracingChannelInterceptor.java
index 009b775f1..2317f5e5e 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TracingChannelInterceptor.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TracingChannelInterceptor.java
@@ -134,11 +134,8 @@ public final class TracingChannelInterceptor extends ChannelInterceptorAdapter
 
 	/**
 	 * Use this to create a span for processing the given message. Note: the result has no
-	 * name and is not started.
-	 * <p>
-	 * <p>
-	 * This creates a child from identifiers extracted from the message headers, or a new
-	 * span if one couldn't be extracted.
+	 * name and is not started. This creates a child from identifiers extracted from the
+	 * message headers, or a new span if one couldn't be extracted.
 	 * @param message message to use for span creation
 	 * @return span to be created
 	 */
diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAspect.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAspect.java
index f3425d745..b77955644 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAspect.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAspect.java
@@ -32,19 +32,14 @@ import org.springframework.cloud.sleuth.instrument.async.TraceCallable;
 import org.springframework.web.context.request.async.WebAsyncTask;
 
 /**
- * Aspect that adds tracing to
- * <p>
- * </p>
- * {@code RestController} annotated classes with public {@link Callable} methods
- * {@link org.springframework.stereotype.Controller} annotated classes with public
- * {@link Callable} methods {@link org.springframework.stereotype.Controller} or
- * {@code RestController} annotated classes with public {@link WebAsyncTask} methods
- * <p>
- * </p>
+ * Aspect that adds tracing. {@code RestController} annotated classes with public
+ * {@link Callable} methods {@link org.springframework.stereotype.Controller} annotated
+ * classes with public {@link Callable} methods
+ * {@link org.springframework.stereotype.Controller} or {@code RestController} annotated
+ * classes with public {@link WebAsyncTask} methods.
+ *
  * For controllers an around aspect is created that wraps the {@link Callable#call()}
- * method execution in {@link TraceCallable}
- * <p>
- * </p>
+ * method execution in {@link TraceCallable}.
  *
  * This aspect will continue a span created by the TracingFilter. It will not create a new
  * span - since the one in TracingFilter will wait until processing has been finished