Merge branch '1.5.x' into 2.0.x

2018-05-03 12:43:50 -07:00
parent 60e4e51fea 4e96587dc8
commit e125085993
138 changed files with 274 additions and 269 deletions
--- a/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/jmx/SampleJmxTests.java
+++ b/spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/jmx/SampleJmxTests.java
@@ -31,6 +31,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 *
 * @author Stephane Nicoll
 */
+@SuppressWarnings("unused")
 // tag::test[]
@RunWith(SpringRunner.class)
@SpringBootTest(properties = "spring.jmx.enabled=true")
@@ -43,7 +44,6 @@ public class SampleJmxTests {
 	@Test
 	public void exampleTest() {
 		// ...
-
 	}

 }