Merge branch '2.0.x'

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java

@@ -174,8 +174,8 @@ public class NoSuchBeanDefinitionFailureAnalyzerTests {
 	public void failureAnalysisForUnmatchedQualifier() {
 		FailureAnalysis analysis = analyzeFailure(
 				createFailure(QualifiedBeanConfiguration.class));
-		assertThat(analysis.getDescription()).contains(
+		assertThat(analysis.getDescription()).containsPattern(
-				"@org.springframework.beans.factory.annotation.Qualifier(value=alpha)");
+				"@org.springframework.beans.factory.annotation.Qualifier\\(value=\"*alpha\"*\\)");
 	}
 
 	private void assertDescriptionConstructorMissingType(FailureAnalysis analysis,