Merge branch '2.0.x'

Author: philwebb

pom.xml

@@ -53,6 +53,7 @@
 									<configLocation>src/checkstyle/checkstyle.xml</configLocation>
 									<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
 									<includeTestSourceDirectory>true</includeTestSourceDirectory>
+									<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
 								</configuration>
 								<goals>
 									<goal>check</goal>

spring-boot-project/pom.xml

@@ -12,7 +12,7 @@
 	<name>Spring Boot Build</name>
 	<description>Spring Boot Build</description>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/..</main.basedir>
 	</properties>
 	<modules>
 		<module>spring-boot-dependencies</module>

spring-boot-project/spring-boot-dependencies/pom.xml

@@ -32,6 +32,7 @@
 		</developer>
 	</developers>
 	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
 		<!-- Dependency versions -->
 		<activemq.version>5.15.6</activemq.version>
 		<antlr2.version>2.7.7</antlr2.version>

spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml

@@ -14,6 +14,7 @@
 	<description>Parent pom providing dependency and plugin management for applications
 		built with Maven</description>
 	<properties>
+		<main.basedir>${basedir}/../../..</main.basedir>
 		<java.version>1.8</java.version>
 		<resource.delimiter>@</resource.delimiter> <!-- delimiter that doesn't clash with Spring ${} placeholders -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/filter/OrderedHiddenHttpMethodFilter.java

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.web.reactive.filter;
 
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.core.Ordered;
 import org.springframework.web.filter.reactive.HiddenHttpMethodFilter;
 
@@ -32,8 +31,7 @@ public class OrderedHiddenHttpMethodFilter extends HiddenHttpMethodFilter
 	/**
 	 * The default order is high to ensure the filter is applied before Spring Security.
 	 */
-	public static final int DEFAULT_ORDER = FilterRegistrationBean.REQUEST_WRAPPER_FILTER_MAX_ORDER
-			- 10000;
+	public static final int DEFAULT_ORDER = -10000;
 
 	private int order = DEFAULT_ORDER;
 

src/checkstyle/checkstyle.xml

@@ -3,9 +3,19 @@
 <module name="com.puppycrawl.tools.checkstyle.Checker">
 	<module name="io.spring.javaformat.checkstyle.SpringChecks" />
 	<module name="com.puppycrawl.tools.checkstyle.TreeWalker">
-		<module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">
-			<property name="illegalPkgs" value="sun, org.apache.commons.(?!compress|dbcp2|lang|lang3|logging|pool2).*, com.google.common, org.flywaydb.core.internal, reactor.core.support.Assert"/>
-			<property name="regexp" value="true"/>
+		<module
+			name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">
+			<property name="regexp" value="true" />
+			<property name="illegalPkgs"
+				value="^sun.*, ^org\.apache\.commons\.(?!compress|dbcp2|lang|lang3|logging|pool2).*, ^com\.google\.common.*, ^org\.flywaydb\.core\.internal.*" />
+			<property name="illegalClasses"
+				value="^reactor\.core\.support\.Assert" />
+		</module>
+		<module
+			name="com.puppycrawl.tools.checkstyle.checks.imports.ImportControlCheck">
+			<property name="file"
+				value="${main.basedir}/src/checkstyle/import-control.xml" />
+			<property name="path" value="^.*[\\/]src[\\/]main[\\/].*$" />
 		</module>
 	</module>
 </module>

src/checkstyle/import-control.xml

@@ -5,12 +5,12 @@
 
 	<subpackage name="autoconfigure">
 		<subpackage name="web">
+			<allow pkg="org.springframework.boot.web.server" />
+			<allow pkg="org.springframework.boot.web.servlet.server" />
 			<disallow pkg="org.springframework.boot.web" />
 			<disallow pkg="org.springframework.web.servlet" />
 			<disallow pkg="org.springframework.web.reactive" />
 			<disallow pkg="javax.servlet" />
-			<allow pkg="org.springframework.boot.web.server" />
-			<allow pkg="org.springframework.boot.web.servlet.server" />
 			<subpackage name="client">
 				<allow pkg="org.springframework.boot.web.client" />
 			</subpackage>