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

Merge branch '2.1.x'

This commit is contained in:
Phillip Webb 2019-06-28 12:22:45 -07:00
parent 7e22901bb2 de35efd1ef
commit c62b6b4ccd
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/Token.java
View File

@ -29,7 +29,7 @@ import org.springframework.util.StringUtils;
* The JSON web token provided with each request that originates from Cloud Foundry. * The JSON web token provided with each request that originates from Cloud Foundry.
* *
* @author Madhura Bhave * @author Madhura Bhave
* @since 2.0.0 * @since 1.5.22
*/ */
public class Token { public class Token {

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java
View File

@ -40,7 +40,7 @@ import org.springframework.util.MultiValueMap;
* Abstract base class for nested conditions. * Abstract base class for nested conditions.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 2.0.1 * @since 1.5.22
*/ */
public abstract class AbstractNestedCondition extends SpringBootCondition implements ConfigurationCondition { public abstract class AbstractNestedCondition extends SpringBootCondition implements ConfigurationCondition {

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

@ -28,8 +28,9 @@ import org.springframework.test.web.servlet.setup.ConfigurableMockMvcBuilder;
* A {@link MockMvcBuilderCustomizer} that configures Spring REST Docs. * A {@link MockMvcBuilderCustomizer} that configures Spring REST Docs.
* *
* @author Andy Wilkinson * @author Andy Wilkinson
* @since 1.5.22
*/ */
class RestDocsMockMvcBuilderCustomizer implements InitializingBean, MockMvcBuilderCustomizer { public class RestDocsMockMvcBuilderCustomizer implements InitializingBean, MockMvcBuilderCustomizer {
private final RestDocsProperties properties; private final RestDocsProperties properties;

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java
View File

@ -39,9 +39,9 @@ import org.springframework.util.StringUtils;
* @param <T> the type of {@link Filter} to register * @param <T> the type of {@link Filter} to register
* @author Phillip Webb * @author Phillip Webb
* @author Brian Clozel * @author Brian Clozel
* @since 2.0.1 * @since 1.5.22
*/ */
public abstract class AbstractFilterRegistrationBean<T extends Filter> extends DynamicRegistrationBean<Dynamic> { public abstract class AbstractFilterRegistrationBean extends RegistrationBean {
private static final String[] DEFAULT_URL_MAPPINGS = { "/*" }; private static final String[] DEFAULT_URL_MAPPINGS = { "/*" };