spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 16:39:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '5.3.x'

Browse Source 
# Conflicts:
#	spring-context/src/main/java/org/springframework/scheduling/annotation/Async.java
#	spring-context/src/testFixtures/java/org/springframework/context/testfixture/jndi/SimpleNamingContextBuilder.java
#	spring-core/src/main/java/org/springframework/core/BridgeMethodResolver.java
#	spring-core/src/main/java/org/springframework/util/MimeType.java
This commit is contained in:
Sam Brannen
2022-07-13 14:55:30 +02:00
parent ff9a4ab35c ea27206a32
commit aae9050351
100 changed files with 182 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-context-indexer/src/test/java/org/springframework/context/index/sample/SampleNonStaticEmbedded.java
+1 -1
View File
@@ -19,7 +19,7 @@ package org.springframework.context.index.sample;
import org.springframework.stereotype.Component;
/**
* Candidate with a inner class that isn't static (and should therefore not be added).
* Candidate with an inner class that isn't static (and should therefore not be added).
*
* @author Stephane Nicoll
*/