Merge branch '3.1.x' into 3.2.x

Closes gh-40576

Author: scottfrederick

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/task/ScheduledBeanLazyInitializationExcludeFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 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.
@@ -18,7 +18,6 @@
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -43,7 +42,7 @@
  */
 class ScheduledBeanLazyInitializationExcludeFilter implements LazyInitializationExcludeFilter {
 
-	private final Set<Class<?>> nonAnnotatedClasses = Collections.newSetFromMap(new ConcurrentHashMap<>(64));
+	private final Set<Class<?>> nonAnnotatedClasses = ConcurrentHashMap.newKeySet(64);
 
 	ScheduledBeanLazyInitializationExcludeFilter() {
 		// Ignore AOP infrastructure such as scoped proxies.

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/net/protocol/jar/JarUrlClassLoader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 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.
@@ -22,7 +22,6 @@
 import java.net.URLClassLoader;
 import java.net.URLConnection;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Enumeration;
 import java.util.Map;
 import java.util.Set;
@@ -47,7 +46,7 @@ public abstract class JarUrlClassLoader extends URLClassLoader {
 
 	private final Map<URL, JarFile> jarFiles = new ConcurrentHashMap<>();
 
-	private final Set<String> undefinablePackages = Collections.newSetFromMap(new ConcurrentHashMap<>());
+	private final Set<String> undefinablePackages = ConcurrentHashMap.newKeySet();
 
 	/**
 	 * Create a new {@link LaunchedClassLoader} instance.