Merge branch '6.1.x'

framework-docs/src/main/java/org/springframework/docs/integration/cache/cacheannotationenable/CacheConfiguration.java

@@ -25,7 +25,7 @@ import org.springframework.context.annotation.Configuration;
 // tag::snippet[]
 @Configuration
 @EnableCaching
-public class CacheConfiguration {
+class CacheConfiguration {
 
 	@Bean
 	CacheManager cacheManager() {

framework-docs/src/main/java/org/springframework/docs/integration/cache/cachestoreconfigurationcaffeine/CacheConfiguration.java

@@ -22,7 +22,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-public class CacheConfiguration {
+class CacheConfiguration {
 
 	// tag::snippet[]
 	@Bean

framework-docs/src/main/java/org/springframework/docs/integration/cache/cachestoreconfigurationcaffeine/CustomCacheConfiguration.java

@@ -24,7 +24,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-public class CustomCacheConfiguration {
+class CustomCacheConfiguration {
 
 	// tag::snippet[]
 	@Bean

framework-docs/src/main/java/org/springframework/docs/integration/cache/cachestoreconfigurationjdk/CacheConfiguration.java

@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-public class CacheConfiguration {
+class CacheConfiguration {
 
 	// tag::snippet[]
 	@Bean

framework-docs/src/main/java/org/springframework/docs/integration/cache/cachestoreconfigurationjsr107/CacheConfiguration.java

@@ -24,7 +24,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-public class CacheConfiguration {
+class CacheConfiguration {
 
 	// tag::snippet[]
 	@Bean

framework-docs/src/main/java/org/springframework/docs/integration/cache/cachestoreconfigurationnoop/CacheConfiguration.java

@@ -24,7 +24,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-public class CacheConfiguration {
+class CacheConfiguration {
 
 	private CacheManager jdkCache() {
 		return null;