Merge branch '2.6.x' into 2.7.x

Author: snicoll

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/BindableTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -146,7 +146,7 @@ void toStringShouldShowDetails() {
 		Bindable<String> bindable = Bindable.of(String.class).withExistingValue("foo").withAnnotations(annotation);
 		assertThat(bindable.toString())
 				.contains("type = java.lang.String, value = 'provided', annotations = array<Annotation>["
-						+ "@org.springframework.boot.context.properties.bind.BindableTests$TestAnnotation()]");
+						+ "@org.springframework.boot.context.properties.bind.BindableTests.TestAnnotation()]");
 	}
 
 	@Test