Skip to content

S
spring-boot
Commit 4df618a2 authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Merge branch '2.3.x' 

Closes gh-22967
parents 7a85373f f75e9884
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/TypeExcludeFilters.java
View file @ 4df618a2
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 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.
...@@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.filter; ...@@ -18,6 +18,7 @@ package org.springframework.boot.test.autoconfigure.filter;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
...@@ -37,6 +38,7 @@ import org.springframework.boot.context.TypeExcludeFilter; ...@@ -37,6 +38,7 @@ import org.springframework.boot.context.TypeExcludeFilter;
@Target(ElementType.TYPE) @Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Documented @Documented
@Inherited
public @interface TypeExcludeFilters { public @interface TypeExcludeFilters {
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment