Merge branch '2.1.x'

Closes gh-18878

Author: wilkinsona

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

@@ -30,6 +30,7 @@
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.core.Ordered;
 import org.springframework.util.StringUtils;
 
 /**
@@ -45,7 +46,7 @@
  * @since 1.3.0
  * @see BeanDefinition#setDependsOn(String[])
  */
-public abstract class AbstractDependsOnBeanFactoryPostProcessor implements BeanFactoryPostProcessor {
+public abstract class AbstractDependsOnBeanFactoryPostProcessor implements BeanFactoryPostProcessor, Ordered {
 
 	private final Class<?> beanClass;
 
@@ -114,6 +115,11 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
 		}
 	}
 
+	@Override
+	public int getOrder() {
+		return 0;
+	}
+
 	private Set<String> getBeanNames(ListableBeanFactory beanFactory) {
 		Set<String> names = getBeanNames(beanFactory, this.beanClass);
 		if (this.factoryBeanClass != null) {

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

@@ -73,6 +73,11 @@ void fooBeansShouldDependOnBarBeanTypesParentContext() {
 		}
 	}
 
+	@Test
+	public void postProcessorHasADefaultOrderOfZero() {
+		assertThat(new FooDependsOnBarTypePostProcessor().getOrder()).isEqualTo(0);
+	}
+
 	private void assertThatFooDependsOnBar(AssertableApplicationContext context) {
 		ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
 		assertThat(getBeanDefinition("foo", beanFactory).getDependsOn()).containsExactly("bar", "barFactoryBean");