Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.4.x' into 2.5.x

Browse Source 
Closes gh-28424
This commit is contained in:
Phillip Webb
2021-10-21 11:27:29 -07:00
parent a3182e453c 2f6651c3cb
commit daf36dff55
24 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java
View File

@@ -233,7 +233,7 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor
element.toString());
if (this.metadataCollector.hasSimilarGroup(group)) {
this.processingEnv.getMessager().printMessage(Kind.ERROR,
"Duplicate `@ConfigurationProperties` definition for prefix '" + prefix + "'", element);
"Duplicate @ConfigurationProperties definition for prefix '" + prefix + "'", element);
}
else {
this.metadataCollector.add(group);

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/docs/GettingStartedDocumentationTests.java
View File

@@ -33,7 +33,7 @@ class GettingStartedDocumentationTests {
GradleBuild gradleBuild;
// NOTE: We can't run any `apply-plugin` tests because during a release the
// NOTE: We can't run any 'apply-plugin' tests because during a release the
// jar won't be there
@TestTemplate

2
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/LayersIndex.java
View File

@@ -42,7 +42,7 @@ import org.springframework.util.MultiValueMap;
* layer.
* <p>
* Index files are designed to be compatible with YAML and may be read into a list of
* `Map&lt;String, List&lt;String&gt;&gt;` instances.
* {@code Map<String, List<String>>} instances.
*
* @author Madhura Bhave
* @author Andy Wilkinson