Merge branch '1.1.x'

Author: wilkinsona

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/BootGlobalAuthenticationConfiguration.java

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.boot.autoconfigure.security;
 
 import java.util.Map;
@@ -43,7 +44,7 @@
  * {@link SpringBootApplication}.
  *
  * @author Rob Winch
- * @since 1.2.2
+ * @since 1.1.11
  */
 @Configuration
 @ConditionalOnClass(GlobalAuthenticationConfigurerAdapter.class)
@@ -57,10 +58,12 @@ public static BootGlobalAuthenticationConfigurationAdapter bootGlobalAuthenticat
 
 	private static class BootGlobalAuthenticationConfigurationAdapter extends
 			GlobalAuthenticationConfigurerAdapter {
-		private final ApplicationContext context;
-		private static final Log logger = LogFactory
+
+		private static Log logger = LogFactory
 				.getLog(BootGlobalAuthenticationConfiguration.class);
 
+		private final ApplicationContext context;
+
 		public BootGlobalAuthenticationConfigurationAdapter(ApplicationContext context) {
 			this.context = context;
 		}

spring-boot-security-tests/spring-boot-security-tests-web-helloworld/pom.xml

@@ -8,7 +8,7 @@
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>spring-boot-security-tests-web-helloworld</artifactId>
-	<name>Spring Boot Security Tests - Web Basic</name>
+	<name>Spring Boot Security Tests - Web Hello World</name>
 	<description>${project.name}</description>
 	<url>http://projects.spring.io/spring-boot/</url>
 	<organization>