Merge branch '1.1.x'

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 the original author or authors.
+ * Copyright 2012-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 the original author or authors.
+ * Copyright 2012-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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

@@ -21,7 +21,6 @@ import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -31,18 +30,19 @@ import org.springframework.security.config.annotation.authentication.configurati
 import org.springframework.security.config.annotation.authentication.configurers.GlobalAuthenticationConfigurerAdapter;
 
 /**
- * This works with the {@link AuthenticationConfiguration} to ensure that users are able
- * to use:
+ * {@link GlobalAuthenticationConfigurerAdapter} to trigger early initialization of
+ * {@code @EnableAutoConfiguration} beans. This configuration is imported from
+ * {@link AuthenticationConfiguration} to ensure that users are able to configure the
+ * {@link AuthenticationManagerBuilder} from their {@code @EnableAutoConfiguration} or
+ * {@code @SpringBootApplication} configuration class:
  *
- * <pre>
+ * <pre class="code">
+ * &#064;Autowired
  * public void configureGlobal(AuthenticationManagerBuilder auth) {
  *     ...
  * }
  * </pre>
  *
- * within their classes annotated with {@link EnableAutoConfiguration} or
- * {@link SpringBootApplication}.
- *
  * @author Rob Winch
  * @since 1.1.11
  */
@@ -76,5 +76,7 @@ public class BootGlobalAuthenticationConfiguration {
 				logger.debug("Eagerly initializing " + beansWithAnnotation);
 			}
 		}
+
 	}
+
 }

spring-boot-dependencies/pom.xml

@@ -1682,4 +1682,4 @@
 			<id>integration-test</id>
 		</profile>
 	</profiles>
-</project>
+</project>

spring-boot-full-build/pom.xml

@@ -57,7 +57,6 @@
 		<module>../spring-boot-samples</module>
 		<module>../spring-boot-deployment-tests</module>
 		<module>../spring-boot-integration-tests</module>
-		<module>../spring-boot-security-tests</module>
 		<module>../spring-boot-docs</module>
 	</modules>
 	<profiles>

spring-boot-integration-tests/pom.xml

@@ -8,7 +8,7 @@
 		<relativePath>../spring-boot-parent</relativePath>
 	</parent>
 	<artifactId>spring-boot-integration-tests</artifactId>
-	<packaging>jar</packaging>
+	<packaging>pom</packaging>
 	<name>Spring Boot Integration Tests</name>
 	<description>Spring Boot Integration Tests</description>
 	<url>http://projects.spring.io/spring-boot/</url>
@@ -19,24 +19,10 @@
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
 	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>org.gradle</groupId>
-			<artifactId>gradle-tooling-api</artifactId>
-			<version>${gradle.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-dependency-tools</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+	<modules>
+		<module>spring-boot-gradle-tests</module>
+		<module>spring-boot-security-tests</module>
+	</modules>
 	<profiles>
 		<profile>
 			<id>default</id>
@@ -50,6 +36,7 @@
 							is available -->
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-invoker-plugin</artifactId>
+						<inherited>false</inherited>
 						<configuration>
 							<settingsFile>src/it/settings.xml</settingsFile>
 							<projectsDirectory>${main.basedir}/spring-boot-samples/</projectsDirectory>
@@ -60,6 +47,9 @@
 								<profile>integration-test</profile>
 							</profiles>
 							<localRepositoryPath> </localRepositoryPath>
+							<pomIncludes>
+								<pomInclude>*/pom.xml</pomInclude>
+							</pomIncludes>
 						</configuration>
 						<executions>
 							<execution>
@@ -75,6 +65,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
+						<inherited>false</inherited>
 						<executions>
 							<execution>
 								<id>clean-samples</id>
@@ -95,6 +86,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-clean-plugin</artifactId>
+						<inherited>false</inherited>
 						<executions>
 							<execution>
 								<id>clean-samples</id>
@@ -112,16 +104,4 @@
 			<id>full</id>
 		</profile>
 	</profiles>
-	<repositories>
-		<repository>
-			<id>gradle</id>
-			<url>http://repo.gradle.org/gradle/libs-releases-local</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
 </project>

spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-integration-tests</artifactId>
+		<version>1.2.2.BUILD-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-boot-gradle-tests</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Boot Gradle Integration Tests</name>
+	<description>Spring Boot Gradle Integration Tests</description>
+	<url>http://projects.spring.io/spring-boot/</url>
+	<organization>
+		<name>Pivotal Software, Inc.</name>
+		<url>http://www.spring.io</url>
+	</organization>
+	<properties>
+		<main.basedir>${basedir}/../..</main.basedir>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.gradle</groupId>
+			<artifactId>gradle-tooling-api</artifactId>
+			<version>${gradle.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-dependency-tools</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<repositories>
+		<repository>
+			<id>gradle</id>
+			<url>http://repo.gradle.org/gradle/libs-releases-local</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+</project>

spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java

@@ -60,7 +60,7 @@ public class StarterDependenciesIntegrationTests {
 	@Parameters
 	public static List<String[]> getStarters() {
 		List<String[]> starters = new ArrayList<String[]>();
-		for (File file : new File("../spring-boot-starters").listFiles()) {
+		for (File file : new File("../../spring-boot-starters").listFiles()) {
 			if (file.isDirectory() && new File(file, "pom.xml").exists()) {
 				String name = file.getName();
 				if (name.startsWith(STARTER_NAME_PREFIX)

spring-boot-integration-tests/spring-boot-security-tests/pom.xml

@@ -3,9 +3,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-parent</artifactId>
+		<artifactId>spring-boot-integration-tests</artifactId>
 		<version>1.2.2.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-boot-parent</relativePath>
 	</parent>
 	<artifactId>spring-boot-security-tests</artifactId>
 	<packaging>pom</packaging>
@@ -16,6 +15,9 @@
 		<name>Pivotal Software, Inc.</name>
 		<url>http://www.spring.io</url>
 	</organization>
+	<properties>
+		<main.basedir>${basedir}/..</main.basedir>
+	</properties>
 	<modules>
 		<module>spring-boot-security-tests-web-helloworld</module>
 	</modules>

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

@@ -16,7 +16,7 @@
 		<url>http://www.spring.io</url>
 	</organization>
 	<properties>
-		<main.basedir>${basedir}/../..</main.basedir>
+		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
 		<dependency>

spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java

@@ -32,4 +32,5 @@ public class HelloWebSecurityApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(HelloWebSecurityApplication.class, args);
 	}
-}
+
+}

spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java

@@ -72,4 +72,5 @@ public class HelloWebSecurityApplicationTests {
 
 		assertThat(this.response.getStatus(), equalTo(HttpServletResponse.SC_OK));
 	}
+
 }

spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.