Merge branch '2.0.x' into 2.1.x

Author: wilkinsona

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/neo4j/Neo4jHealthIndicatorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/AbstractGenericProperties.java

@@ -22,6 +22,9 @@
 /**
  * A base properties class with generics.
  *
+ * @param <A> name type
+ * @param <B> mapping key type
+ * @param <C> mapping value type
  * @author Stephane Nicoll
  */
 public class AbstractGenericProperties<A, B, C> {

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/AbstractIntermediateGenericProperties.java

@@ -19,6 +19,7 @@
 /**
  * An intermediate layer that resolves some of the generics from the parent but not all.
  *
+ * @param <C> mapping value type
  * @author Stephane Nicoll
  */
 public abstract class AbstractIntermediateGenericProperties<C>

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/generic/UnresolvedGenericProperties.java

@@ -21,6 +21,8 @@
 /**
  * Properties with unresolved generic information.
  *
+ * @param <B> mapping key type
+ * @param <C> mapping value type
  * @author Stephane Nicoll
  */
 @ConfigurationProperties("generic")