Merge branch '1.5.x' into 2.0.x

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/properties/AnnotationsPropertySource.java

@@ -90,8 +90,11 @@ public class AnnotationsPropertySource extends EnumerablePropertySource<Class<?>
 		if (annotations != null) {
 			for (Annotation annotation : annotations) {
 				if (!AnnotationUtils.isInJavaLangAnnotationPackage(annotation)) {
-					mergedAnnotations
+					Annotation mergedAnnotation = findMergedAnnotation(root,
-							.add(findMergedAnnotation(root, annotation.annotationType()));
+							annotation.annotationType());
+					if (mergedAnnotation != null) {
+						mergedAnnotations.add(mergedAnnotation);
+					}
 				}
 			}
 		}

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/apt/examples/custom-layout.apt

@@ -34,7 +34,7 @@
         </executions>
         <dependencies>
           <dependency>
-            <groupId>com.example</groupid>
+            <groupId>com.example</groupId>
             <artifactId>custom-layout</artifactId>
             <version>0.0.1.BUILD-SNAPSHOT</version>
           </dependency>

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContext.java

@@ -132,6 +132,7 @@ public class ServletWebServerApplicationContext extends GenericWebApplicationCon
 		beanFactory.addBeanPostProcessor(
 				new WebApplicationContextServletContextAwareProcessor(this));
 		beanFactory.ignoreDependencyInterface(ServletContextAware.class);
+		registerWebApplicationScopes(null);
 	}
 
 	@Override
@@ -226,19 +227,22 @@ public class ServletWebServerApplicationContext extends GenericWebApplicationCon
 
 	private void selfInitialize(ServletContext servletContext) throws ServletException {
 		prepareWebApplicationContext(servletContext);
-		ConfigurableListableBeanFactory beanFactory = getBeanFactory();
+		registerWebApplicationScopes(servletContext);
-		ExistingWebApplicationScopes existingScopes = new ExistingWebApplicationScopes(
+		WebApplicationContextUtils.registerEnvironmentBeans(getBeanFactory(),
-				beanFactory);
+				servletContext);
-		WebApplicationContextUtils.registerWebApplicationScopes(beanFactory,
-				getServletContext());
-		existingScopes.restore();
-		WebApplicationContextUtils.registerEnvironmentBeans(beanFactory,
-				getServletContext());
 		for (ServletContextInitializer beans : getServletContextInitializerBeans()) {
 			beans.onStartup(servletContext);
 		}
 	}
 
+	private void registerWebApplicationScopes(ServletContext servletContext) {
+		ExistingWebApplicationScopes existingScopes = new ExistingWebApplicationScopes(
+				getBeanFactory());
+		WebApplicationContextUtils.registerWebApplicationScopes(getBeanFactory(),
+				servletContext);
+		existingScopes.restore();
+	}
+
 	/**
 	 * Returns {@link ServletContextInitializer}s that should be used with the embedded
 	 * web server. By default this method will first attempt to find

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletWebServerApplicationContextTests.java

@@ -39,12 +39,15 @@ import org.mockito.Captor;
 import org.mockito.InOrder;
 import org.mockito.MockitoAnnotations;
 
+import org.springframework.beans.BeansException;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.ConstructorArgumentValues;
 import org.springframework.beans.factory.config.Scope;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.boot.web.context.ServerPortInfoApplicationContextInitializer;
 import org.springframework.boot.web.servlet.DelegatingFilterProxyRegistrationBean;
@@ -449,7 +452,8 @@ public class ServletWebServerApplicationContextTests {
 	}
 
 	@Test
-	public void doesNotReplaceExistingScopes() { // gh-2082
+	public void doesNotReplaceExistingScopes() {
+		// gh-2082
 		Scope scope = mock(Scope.class);
 		ConfigurableListableBeanFactory factory = this.context.getBeanFactory();
 		factory.registerScope(WebApplicationContext.SCOPE_REQUEST, scope);
@@ -462,6 +466,29 @@ public class ServletWebServerApplicationContextTests {
 				.isSameAs(scope);
 	}
 
+	@Test
+	public void servletRequestCanBeInjectedEarly() throws Exception {
+		// gh-14990
+		addWebServerFactoryBean();
+		RootBeanDefinition beanDefinition = new RootBeanDefinition(
+				WithAutowiredServletRequest.class);
+		beanDefinition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_CONSTRUCTOR);
+		this.context.registerBeanDefinition("withAutowiredServletRequest",
+				beanDefinition);
+		this.context.addBeanFactoryPostProcessor(new BeanFactoryPostProcessor() {
+
+			@Override
+			public void postProcessBeanFactory(
+					ConfigurableListableBeanFactory beanFactory) throws BeansException {
+				WithAutowiredServletRequest bean = beanFactory
+						.getBean(WithAutowiredServletRequest.class);
+				assertThat(bean.getRequest()).isNotNull();
+			}
+
+		});
+		this.context.refresh();
+	}
+
 	private void addWebServerFactoryBean() {
 		this.context.registerBeanDefinition("webServerFactory",
 				new RootBeanDefinition(MockServletWebServerFactory.class));
@@ -514,4 +541,18 @@ public class ServletWebServerApplicationContextTests {
 
 	}
 
+	protected static class WithAutowiredServletRequest {
+
+		private final ServletRequest request;
+
+		public WithAutowiredServletRequest(ServletRequest request) {
+			this.request = request;
+		}
+
+		public ServletRequest getRequest() {
+			return this.request;
+		}
+
+	}
+
 }