pull/8206/merge
Stephane Nicoll 8 years ago
parent 8c31000efa
commit 519a03ccda

@ -228,13 +228,13 @@ public class ImportAutoConfigurationImportSelectorTests {
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@ImportAutoConfiguration(FreeMarkerAutoConfiguration.class) @ImportAutoConfiguration(FreeMarkerAutoConfiguration.class)
static @interface ImportOne { @interface ImportOne {
} }
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@ImportAutoConfiguration(ThymeleafAutoConfiguration.class) @ImportAutoConfiguration(ThymeleafAutoConfiguration.class)
static @interface ImportTwo { @interface ImportTwo {
} }
@ -288,7 +288,7 @@ public class ImportAutoConfigurationImportSelectorTests {
@ImportAutoConfiguration @ImportAutoConfiguration
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
static @interface MetaImportAutoConfiguration { @interface MetaImportAutoConfiguration {
@AliasFor(annotation = ImportAutoConfiguration.class, attribute = "exclude") @AliasFor(annotation = ImportAutoConfiguration.class, attribute = "exclude")
Class<?>[] exclude() default {}; Class<?>[] exclude() default {};
@ -296,19 +296,19 @@ public class ImportAutoConfigurationImportSelectorTests {
} }
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
static @interface UnrelatedOne { @interface UnrelatedOne {
} }
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
static @interface UnrelatedTwo { @interface UnrelatedTwo {
} }
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@ImportAutoConfiguration(ThymeleafAutoConfiguration.class) @ImportAutoConfiguration(ThymeleafAutoConfiguration.class)
@SelfAnnotating @SelfAnnotating
static @interface SelfAnnotating { @interface SelfAnnotating {
@AliasFor(annotation = ImportAutoConfiguration.class, attribute = "exclude") @AliasFor(annotation = ImportAutoConfiguration.class, attribute = "exclude")
Class<?>[] excludeAutoConfiguration() default {}; Class<?>[] excludeAutoConfiguration() default {};

Loading…
Cancel
Save