root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '3.4.x'

This commit is contained in:
Phillip Webb 2025-04-11 09:42:20 -07:00
parent 0d4b1dc9a4 35dc8e6f88
commit 75824bb9c7
25 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/java/org/springframework/boot/build/bom/BomExtension.java
View File

@ -186,7 +186,7 @@ public class BomExtension {
private final AlignWithHandler alignWith;
private boolean considerSnapshots = false;
private boolean considerSnapshots;
private String version;

4
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointAutoConfigurationTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2025 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.
@ -87,7 +87,7 @@ class LiquibaseEndpointAutoConfigurationTests {
SpringLiquibase liquibase() {
return new DataSourceClosingSpringLiquibase() {
private boolean propertiesSet = false;
private boolean propertiesSet;
@Override
public void setCloseDataSourceOnceMigrated(boolean closeDataSourceOnceMigrated) {

4
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/jms/JmsHealthIndicatorTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2025 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.
@ -117,7 +117,7 @@ class JmsHealthIndicatorTests {
private static final class UnresponsiveStartAnswer implements Answer<Void> {
private boolean connectionClosed = false;
private boolean connectionClosed;
private final Object monitor = new Object();

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
View File

@ -1224,7 +1224,7 @@ class FlywayAutoConfigurationTests {
@Component
static class MockFlywayMigrationStrategy implements FlywayMigrationStrategy {
private boolean called = false;
private boolean called;
@Override
public void migrate(Flyway flyway) {

2
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java
View File

@ -116,7 +116,7 @@ public class Restarter {
private final UncaughtExceptionHandler exceptionHandler;
private boolean finished = false;
private boolean finished;
private final List<ConfigurableApplicationContext> rootContexts = new CopyOnWriteArrayList<>();

4
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/runner/AbstractApplicationContextRunner.java
View File

@ -509,9 +509,9 @@ public abstract class AbstractApplicationContextRunner<SELF extends AbstractAppl
private final Class<?>[] additionalContextInterfaces;
private boolean allowBeanDefinitionOverriding = false;
private boolean allowBeanDefinitionOverriding;
private boolean allowCircularReferences = false;
private boolean allowCircularReferences;
private List<ApplicationContextInitializer<? super C>> initializers = Collections.emptyList();

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestClientCustomizer.java
View File

@ -68,7 +68,7 @@ public class MockServerRestClientCustomizer implements RestClientCustomizer {
private final Supplier<? extends RequestExpectationManager> expectationManagerSupplier;
private boolean bufferContent = false;
private boolean bufferContent;
public MockServerRestClientCustomizer() {
this(SimpleRequestExpectationManager::new);

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizer.java
View File

@ -70,7 +70,7 @@ public class MockServerRestTemplateCustomizer implements RestTemplateCustomizer
private boolean detectRootUri = true;
private boolean bufferContent = false;
private boolean bufferContent;
public MockServerRestTemplateCustomizer() {
this(SimpleRequestExpectationManager::new);

8
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/build/Phase.java
View File

@ -1,5 +1,9 @@
/*
<<<<<<< HEAD
* Copyright 2012-2024 the original author or authors.
=======
* Copyright 2012-2025 the original author or authors.
>>>>>>> 3.3.x
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -38,7 +42,7 @@ class Phase {
private final String name;
private boolean daemonAccess = false;
private boolean daemonAccess;
private final List<String> args = new ArrayList<>();
@ -50,7 +54,7 @@ class Phase {
private String networkMode;
private boolean requiresApp = false;
private boolean requiresApp;
/**
* Create a new {@link Phase} instance.

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuild.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2024 the original author or authors.
* Copyright 2012-2025 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.
@ -67,7 +67,7 @@ public class GradleBuild {
private final List<String> expectedDeprecationMessages = new ArrayList<>();
private boolean configurationCache = false;
private boolean configurationCache;
private final Map<String, String> scriptProperties = new HashMap<>();

4
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java
View File

@ -89,7 +89,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
* @since 1.0.0
*/
@Parameter(property = "spring-boot.run.addResources", defaultValue = "false")
private boolean addResources = false;
private boolean addResources;
/**
* Path to agent jars.
@ -105,7 +105,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
* @since 1.0.0
*/
@Parameter(property = "spring-boot.run.noverify")
private boolean noverify = false;
private boolean noverify;
/**
* Current working directory to use for the application. If not specified, basedir

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ApplicationProperties.java
View File

@ -58,7 +58,7 @@ class ApplicationProperties {
/**
* Whether initialization should be performed lazily.
*/
private boolean lazyInitialization = false;
private boolean lazyInitialization;
/**
* Whether to log information about the application when it starts.

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View File

@ -233,7 +233,7 @@ public class SpringApplication {
private Set<String> additionalProfiles = Collections.emptySet();
private boolean isCustomEnvironment = false;
private boolean isCustomEnvironment;
private String environmentPrefix;

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/admin/SpringApplicationAdminMXBeanRegistrar.java
View File

@ -61,9 +61,9 @@ public class SpringApplicationAdminMXBeanRegistrar implements ApplicationContext
private final ObjectName objectName;
private boolean ready = false;
private boolean ready;
private boolean embeddedWebApplication = false;
private boolean embeddedWebApplication;
public SpringApplicationAdminMXBeanRegistrar(String name) throws MalformedObjectNameException {
this.objectName = new ObjectName(name);

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2025 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.
@ -92,7 +92,7 @@ public class SpringApplicationBuilder {
private boolean registerShutdownHookApplied;
private boolean configuredAsChild = false;
private boolean configuredAsChild;
public SpringApplicationBuilder(Class<?>... sources) {
this(null, sources);

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/AbstractScriptDatabaseInitializer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2025 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.
@ -188,7 +188,7 @@ public abstract class AbstractScriptDatabaseInitializer implements ResourceLoade
private final List<Resource> resources;
private boolean continueOnError = false;
private boolean continueOnError;
private String separator = ";";

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/DatabaseInitializationSettings.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2025 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.
@ -31,7 +31,7 @@ public class DatabaseInitializationSettings {
private List<String> dataLocations;
private boolean continueOnError = false;
private boolean continueOnError;
private String separator = ";";

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactory.java
View File

@ -104,7 +104,7 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
private boolean eagerFilterInit = true;
private boolean preservePathOnForward = false;
private boolean preservePathOnForward;
/**
* Create a new {@link UndertowServletWebServerFactory} instance.

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowWebServerFactoryDelegate.java
View File

@ -69,7 +69,7 @@ class UndertowWebServerFactoryDelegate {
private String accessLogSuffix;
private boolean accessLogEnabled = false;
private boolean accessLogEnabled;
private boolean accessLogRotate = true;

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/Compression.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2025 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.
@ -28,7 +28,7 @@ import org.springframework.util.unit.DataSize;
*/
public class Compression {
private boolean enabled = false;
private boolean enabled;
private String[] mimeTypes = new String[] { "text/html", "text/xml", "text/plain", "text/css", "text/javascript",
"application/javascript", "application/json", "application/xml" };

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/server/Http2.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2025 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.
@ -24,7 +24,7 @@ package org.springframework.boot.web.server;
*/
public class Http2 {
private boolean enabled = false;
private boolean enabled;
/**
* Return whether to enable HTTP/2 support, if the current environment supports it.

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java
View File

@ -55,7 +55,7 @@ public abstract class AbstractFilterRegistrationBean<T extends Filter> extends D
private EnumSet<DispatcherType> dispatcherTypes;
private boolean matchAfter = false;
private boolean matchAfter;
/**
* Create a new instance to be registered with the specified

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactory.java
View File

@ -68,7 +68,7 @@ public abstract class AbstractServletWebServerFactory extends AbstractConfigurab
private Session session = new Session();
private boolean registerDefaultServlet = false;
private boolean registerDefaultServlet;
private MimeMappings mimeMappings = MimeMappings.lazyCopy(MimeMappings.DEFAULT);

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/ErrorPageFilter.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2024 the original author or authors.
* Copyright 2012-2025 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.
@ -314,7 +314,7 @@ public class ErrorPageFilter implements Filter, ErrorPageRegistry, Ordered {
private String message;
private boolean hasErrorToSend = false;
private boolean hasErrorToSend;
ErrorWrapperResponse(HttpServletResponse response) {
super(response);

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/logging/LoggingApplicationListenerTests.java
View File

@ -691,7 +691,7 @@ class LoggingApplicationListenerTests {
static final class TestCleanupLoggingSystem extends LoggingSystem {
private boolean cleanedUp = false;
private boolean cleanedUp;
TestCleanupLoggingSystem(ClassLoader classLoader) {
}