root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-05-28 09:28:30 +02:00
parent be9a0ef65d 547fa9d5c6
commit 7462401291
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsWebTestClientBuilderCustomizer.java
View File

@ -22,7 +22,7 @@ import org.springframework.test.web.reactive.server.WebTestClient;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
/** /**
* A {@WebTestClientBuilderCustomizer} that configures Spring REST Docs. * A {@link WebTestClientBuilderCustomizer} that configures Spring REST Docs.
* *
* @author Roman Zaynetdinov * @author Roman Zaynetdinov
* @author Andy Wilkinson * @author Andy Wilkinson

4
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestCustomConfigNameTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2017 the original author or authors. * Copyright 2012-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -27,7 +27,7 @@ import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
/** /**
* Tests for {@SpringBootTest} with a custom config name * Tests for {@link SpringBootTest} with a custom config name
* *
* @author Andy Wilkinson * @author Andy Wilkinson
*/ */

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SinglePublishedArtifact.java
View File

@ -22,7 +22,7 @@ import org.gradle.api.artifacts.PublishArtifactSet;
import org.gradle.api.tasks.TaskDependency; import org.gradle.api.tasks.TaskDependency;
/** /**
* A wrapper for a {@PublishArtifactSet} that ensures that only a single artifact is * A wrapper for a {@link PublishArtifactSet} that ensures that only a single artifact is
* published, with a war file taking precedence over a jar file. * published, with a war file taking precedence over a jar file.
* *
* @author Andy Wilkinson * @author Andy Wilkinson

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/CompositeResourceManager.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2017 the original author or authors. * Copyright 2012-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -26,7 +26,7 @@ import io.undertow.server.handlers.resource.ResourceChangeListener;
import io.undertow.server.handlers.resource.ResourceManager; import io.undertow.server.handlers.resource.ResourceManager;
/** /**
* A {@ResourceManager} that delegates to multiple {@code ResourceManager} instances. * A {@link ResourceManager} that delegates to multiple {@code ResourceManager} instances.
* *
* @author Andy Wilkinson * @author Andy Wilkinson
*/ */