Skip to content

S
spring-boot
Commit 63d48615 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '2.3.x' into 2.4.x 

Closes gh-26317
parents 17fa215c 3f528bb0
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringBootConfiguration.java
View file @ 63d48615
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2021 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.
...@@ -25,6 +25,7 @@ import java.lang.annotation.Target; ...@@ -25,6 +25,7 @@ import java.lang.annotation.Target;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.AliasFor; import org.springframework.core.annotation.AliasFor;
import org.springframework.stereotype.Indexed;
/** /**
* Indicates that a class provides Spring Boot application * Indicates that a class provides Spring Boot application
...@@ -44,6 +45,7 @@ import org.springframework.core.annotation.AliasFor; ...@@ -44,6 +45,7 @@ import org.springframework.core.annotation.AliasFor;
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Documented @Documented
@Configuration @Configuration
@Indexed
public @interface SpringBootConfiguration { public @interface SpringBootConfiguration {
/** /**
......
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