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.7.x'

This commit is contained in:
Moritz Halbritter 2022-02-18 13:15:11 +01:00
parent 6a1fe01a63 4f49e8c990
commit f5f6a1fe83
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ImportAutoConfiguration.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2022 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.
@ -59,7 +59,7 @@ public @interface ImportAutoConfiguration {
/** /**
* The auto-configuration classes that should be imported. When empty, the classes are * The auto-configuration classes that should be imported. When empty, the classes are
* specified using an entry in {@code META-INF/spring.factories} where the key is the * specified using a file in {@code META-INF/spring-boot} where the file name is the
* fully-qualified name of the annotated class. * fully-qualified name of the annotated class.
* @return the classes to import * @return the classes to import
*/ */