Merge branch '3.1.x' into 3.2.x

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementWebServerFactoryCustomizer.java

@@ -81,6 +81,7 @@ private void customizeSameAsParentContext(T factory) {
 				customizers.add(BeanFactoryUtils.beanOfTypeIncludingAncestors(this.beanFactory, customizerClass));
 			}
 			catch (NoSuchBeanDefinitionException ex) {
+				// Ignore
 			}
 		}
 		invokeCustomizers(factory, customizers);

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoker/cache/CachingOperationInvoker.java

@@ -110,6 +110,7 @@ private void cleanExpiredCachedResponses(long accessTime) {
 			this.cachedResponses.entrySet().removeIf((entry) -> entry.getValue().isStale(accessTime, this.timeToLive));
 		}
 		catch (Exception ex) {
+			// Ignore
 		}
 	}
 

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/HealthEndpointTests.java

@@ -79,6 +79,7 @@ void healthWhenIndicatorIsSlow(CapturedOutput output) {
 				Thread.sleep(100);
 			}
 			catch (InterruptedException ex) {
+				// Ignore
 			}
 			return this.up;
 		};

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

@@ -124,6 +124,7 @@ private void configureConfigurationClassPostProcessor(BeanDefinitionRegistry reg
 						registry.getBeanDefinition(AnnotationConfigUtils.CONFIGURATION_ANNOTATION_PROCESSOR_BEAN_NAME));
 			}
 			catch (NoSuchBeanDefinitionException ex) {
+				// Ignore
 			}
 		}
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheCondition.java

@@ -56,6 +56,7 @@ public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeM
 			}
 		}
 		catch (BindException ex) {
+			// Ignore
 		}
 		return ConditionOutcome.noMatch(message.because("unknown cache type"));
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java

@@ -500,6 +500,7 @@ private Set<Class<?>> resolveWhenPossible(Set<String> classNames) {
 					resolved.add(resolve(className, this.classLoader));
 				}
 				catch (ClassNotFoundException | NoClassDefFoundError ex) {
+					// Ignore
 				}
 			}
 			return resolved;

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizer.java

@@ -164,6 +164,7 @@ private abstract static class AbstractOptions {
 						lookup.put(getCanonicalName(field.getName()), option);
 					}
 					catch (IllegalAccessException ex) {
+						// Ignore
 					}
 				}
 			});

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java

@@ -495,6 +495,7 @@ private Resource getIndexHtmlResource(Resource location) {
 				}
 			}
 			catch (Exception ex) {
+				// Ignore
 			}
 			return null;
 		}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/DefaultErrorViewResolver.java

@@ -126,6 +126,7 @@ private ModelAndView resolveResource(String viewName, Map<String, Object> model)
 				}
 			}
 			catch (Exception ex) {
+				// Ignore
 			}
 		}
 		return null;

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java

@@ -578,6 +578,7 @@ public Object postProcessAfterInitialization(Object bean, String beanName) throw
 					jobRegistry.register(getJobFactory());
 				}
 				catch (DuplicateJobException ex) {
+					// Ignore
 				}
 			}
 			return bean;

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/SessionAutoConfigurationTests.java

@@ -106,6 +106,7 @@ void filterIsRegisteredWithAsyncErrorAndRequestDispatcherTypes() {
 				delegatingFilterProxy.doFilter(null, null, null);
 			}
 			catch (Exception ex) {
+				// Ignore
 			}
 			assertThat(delegatingFilterProxy).extracting("delegate")
 				.isSameAs(context.getBean(SessionRepositoryFilter.class));

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/lifecycle/TcpConnectServiceReadinessCheck.java

@@ -72,6 +72,7 @@ private void check(RunningService service, int port, Socket socket) throws IOExc
 			}
 		}
 		catch (SocketTimeoutException ex) {
+			// Ignore
 		}
 	}
 

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTypeExcludeFilter.java

@@ -43,6 +43,7 @@ public final class JsonTypeExcludeFilter extends StandardAnnotationCustomizableT
 			includes.add(ClassUtils.forName(JACKSON_MODULE, null));
 		}
 		catch (Exception ex) {
+			// Ignore
 		}
 		includes.add(JsonComponent.class);
 		DEFAULT_INCLUDES = Collections.unmodifiableSet(includes);

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java

@@ -204,6 +204,7 @@ public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) t
 				registry.removeBeanDefinition(ImportsConfiguration.BEAN_NAME);
 			}
 			catch (NoSuchBeanDefinitionException ex) {
+				// Ignore
 			}
 		}
 

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java

@@ -167,6 +167,7 @@ private Method getMainMethod(MergedContextConfiguration mergedConfig, UseMainMet
 				mainMethod = ReflectionUtils.findMethod(kotlinClass, "main", String[].class);
 			}
 			catch (ClassNotFoundException ex) {
+				// Ignore
 			}
 		}
 		Assert.state(mainMethod != null || useMainMethod == UseMainMethod.WHEN_AVAILABLE,
@@ -555,6 +556,7 @@ private ApplicationContext run(ThrowingSupplier<ConfigurableApplicationContext>
 				}
 			}
 			catch (AbandonedRunException ex) {
+				// Ignore
 			}
 			catch (Exception ex) {
 				if (this.failedContexts.size() == 1) {

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/assertj/ApplicationContextAssert.java

@@ -203,6 +203,7 @@ public ApplicationContextAssert<C> doesNotHaveBean(String name) {
 					getApplicationContext(), name, bean));
 		}
 		catch (NoSuchBeanDefinitionException ex) {
+			// Ignore
 		}
 		return this;
 	}

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/AbstractJsonMarshalTester.java

@@ -316,6 +316,7 @@ private void closeQuietly(Closeable closeable) {
 			closeable.close();
 		}
 		catch (IOException ex) {
+			// Ignore
 		}
 	}
 

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/json/JsonContentAssert.java

@@ -1095,6 +1095,7 @@ void assertDoesNotHavePath() {
 				failWithMessage("Expecting no JSON path \"%s\"", this.expression);
 			}
 			catch (PathNotFoundException ex) {
+				// Ignore
 			}
 		}
 

spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleBeanFactoryPostProcessor.java

@@ -50,6 +50,7 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
 				}
 			}
 			catch (NoSuchBeanDefinitionException ex) {
+				// Ignore
 			}
 		}
 	}

spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/ContainerConnectionDetailsFactory.java

@@ -93,6 +93,7 @@ public final D getConnectionDetails(ContainerConnectionSource<C> source) {
 			}
 		}
 		catch (NoClassDefFoundError ex) {
+			// Ignore
 		}
 		return null;
 	}

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/ssl/PrivateKeyParser.java

@@ -203,6 +203,7 @@ private PrivateKey parse(byte[] bytes) {
 					return keyFactory.generatePrivate(keySpec);
 				}
 				catch (InvalidKeySpecException | NoSuchAlgorithmException ex) {
+					// Ignore
 				}
 			}
 			return null;

spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/TotalProgressListenerTests.java

@@ -78,6 +78,7 @@ public void onUpdate(TestImageUpdateEvent event) {
 				Thread.sleep(10);
 			}
 			catch (InterruptedException ex) {
+				// Ignore
 			}
 		}
 

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSON.java

@@ -51,7 +51,8 @@ static Double toDouble(Object value) {
 			try {
 				return Double.valueOf((String) value);
 			}
-			catch (NumberFormatException ignored) {
+			catch (NumberFormatException ex) {
+				// Ignore
 			}
 		}
 		return null;
@@ -68,7 +69,8 @@ static Integer toInteger(Object value) {
 			try {
 				return (int) Double.parseDouble((String) value);
 			}
-			catch (NumberFormatException ignored) {
+			catch (NumberFormatException ex) {
+				// Ignore
 			}
 		}
 		return null;
@@ -85,7 +87,8 @@ static Long toLong(Object value) {
 			try {
 				return (long) Double.parseDouble((String) value);
 			}
-			catch (NumberFormatException ignored) {
+			catch (NumberFormatException ex) {
+				// Ignore
 			}
 		}
 		return null;

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONObject.java

@@ -827,7 +827,8 @@ else if (o.getClass().isArray()) {
 				return o.toString();
 			}
 		}
-		catch (Exception ignored) {
+		catch (Exception ex) {
+			// Ignore
 		}
 		return null;
 	}

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONTokener.java

@@ -320,7 +320,8 @@ else if (number.startsWith("0") && number.length() > 1) {
 		try {
 			return Double.valueOf(literal);
 		}
-		catch (NumberFormatException ignored) {
+		catch (NumberFormatException ex) {
+			// Ignore
 		}
 
 		/* ... finally give up. We have an unquoted string */

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootZipCopyAction.java

@@ -204,6 +204,7 @@ private void closeQuietly(OutputStream outputStream) {
 			outputStream.close();
 		}
 		catch (IOException ex) {
+			// Ignore
 		}
 	}
 

spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java

@@ -127,6 +127,7 @@ protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundE
 				return result;
 			}
 			catch (ClassNotFoundException ex) {
+				// Ignore
 			}
 		}
 		if (this.exploded) {

spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java

@@ -151,6 +151,7 @@ private Path createUnpackDirectory(Path parent) {
 				return unpackDirectory;
 			}
 			catch (IOException ex) {
+				// Ignore
 			}
 		}
 		throw new IllegalStateException("Failed to create unpack directory in directory '" + parent + "'");

spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/jar/Handler.java

@@ -140,6 +140,7 @@ private URLConnection openFallbackTomcatConnection(URL url) {
 				return connection;
 			}
 			catch (IOException ex) {
+				// Ignore
 			}
 		}
 		return null;
@@ -154,6 +155,7 @@ private boolean isTomcatWarUrl(String file) {
 				}
 			}
 			catch (Exception ex) {
+				// Ignore
 			}
 		}
 		return false;
@@ -174,6 +176,7 @@ private URLConnection openFallbackContextConnection(URL url) {
 			}
 		}
 		catch (Exception ex) {
+			// Ignore
 		}
 		return null;
 	}
@@ -425,6 +428,7 @@ static void captureJarContextUrl() {
 					}
 				}
 				catch (Exception ex) {
+					// Ignore
 				}
 			}
 			finally {

spring-boot-project/spring-boot-tools/spring-boot-loader-classic/src/main/java/org/springframework/boot/loader/jar/JarFile.java

@@ -144,6 +144,7 @@ private JarFile(RandomAccessDataFile rootFile, String pathFromRoot, RandomAccess
 				super.close();
 			}
 			catch (IOException ioex) {
+				// Ignore
 			}
 			throw ex;
 		}

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/nio/file/NestedFileSystem.java

@@ -138,6 +138,7 @@ private void closeZipFileSystem(FileSystem zipFileSystem) {
 			zipFileSystem.close();
 		}
 		catch (Exception ex) {
+			// Ignore
 		}
 	}
 

spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/zip/ZipContentTests.java

@@ -88,6 +88,7 @@ void tearDown() throws Exception {
 				this.zipContent.close();
 			}
 			catch (IllegalStateException ex) {
+				// Ignore
 			}
 		}
 	}

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/JarIntegrationTests.java

@@ -349,6 +349,7 @@ void repackagedJarContainsTheLayersIndexByDefault(MavenBuild mavenBuild) {
 					.anyMatch((dependency) -> dependency.startsWith("BOOT-INF/lib/log4j-api-2"));
 			}
 			catch (IOException ex) {
+				// Ignore
 			}
 		});
 	}

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/WarIntegrationTests.java

@@ -167,6 +167,7 @@ void repackagedWarContainsTheLayersIndexByDefault(MavenBuild mavenBuild) {
 					.anyMatch((dependency) -> dependency.startsWith("WEB-INF/lib-provided/"));
 			}
 			catch (IOException ex) {
+				// Ignore
 			}
 		});
 	}

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java

@@ -186,6 +186,7 @@ private static boolean isShortenedIntelliJJar(URL url) {
 				return createdBy != null && createdBy.contains("IntelliJ");
 			}
 			catch (Exception ex) {
+				// Ignore
 			}
 		}
 		return false;
@@ -330,6 +331,7 @@ private boolean isExcluded(URL url) {
 					}
 				}
 				catch (URISyntaxException ex) {
+					// Ignore
 				}
 			}
 			return false;

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiPropertySource.java

@@ -150,7 +150,8 @@ AnsiElement getElement(String postfix) {
 				try {
 					return this.factory.apply(Integer.parseInt(postfix));
 				}
-				catch (IllegalArgumentException ignored) {
+				catch (IllegalArgumentException ex) {
+					// Ignore
 				}
 			}
 			return null;

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBean.java

@@ -168,6 +168,7 @@ private static Map<String, ConfigurationPropertiesBean> getAll(ConfigurableAppli
 					}
 				}
 				catch (Exception ex) {
+					// Ignore
 				}
 			}
 		}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/handler/NoUnboundElementsBindHandler.java

@@ -110,6 +110,7 @@ private void collectUnbound(ConfigurationPropertyName name, Set<ConfigurationPro
 						source.filter((candidate) -> isUnbound(name, candidate)).getConfigurationProperty(unboundName));
 			}
 			catch (Exception ex) {
+				// Ignore
 			}
 		}
 	}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/validation/ValidationBindHandler.java

@@ -212,6 +212,7 @@ private <T> T getBoundField(Map<ConfigurationPropertyName, T> boundFields, Strin
 				}
 			}
 			catch (Exception ex) {
+				// Ignore
 			}
 			return null;
 		}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/ConfigurationPropertySourcesPropertyResolver.java

@@ -49,6 +49,7 @@ public boolean containsProperty(String key) {
 					return attached.findConfigurationProperty(name) != null;
 				}
 				catch (Exception ex) {
+					// Ignore
 				}
 			}
 		}
@@ -91,6 +92,7 @@ private Object findPropertyValue(String key) {
 					return (configurationProperty != null) ? configurationProperty.getValue() : null;
 				}
 				catch (Exception ex) {
+					// Ignore
 				}
 			}
 		}