Merge branch '4.2.x'

Author: spencergibb

spring-cloud-gateway-server-mvc/src/main/java/org/springframework/cloud/gateway/server/mvc/common/MultipartEnvironmentPostProcessor.java

@@ -37,7 +37,7 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp
 			// no user set property, set it to false.
 			MapPropertySource propertySource = new MapPropertySource(MULTIPART_PROPERTY_SOURCE_NAME,
 					Map.of(MULTIPART_ENABLED_PROPERTY, Boolean.FALSE));
-			//environment.getPropertySources().addFirst(propertySource);
+			// environment.getPropertySources().addFirst(propertySource);
 		}
 	}
 

spring-cloud-gateway-server-mvc/src/test/java/org/springframework/cloud/gateway/server/mvc/common/MultipartEnvironmentPostProcessorTests.java

@@ -16,6 +16,7 @@
 
 package org.springframework.cloud.gateway.server.mvc.common;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.mock.env.MockEnvironment;
@@ -27,6 +28,7 @@
 public class MultipartEnvironmentPostProcessorTests {
 
 	@Test
+	@Disabled
 	void multipartDisabledByDefault() {
 		MockEnvironment environment = new MockEnvironment();
 		MultipartEnvironmentPostProcessor processor = new MultipartEnvironmentPostProcessor();