From 8a8b5d3aa74298a056f839ed28f60944caaa7e54 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Mon, 23 Feb 2015 13:12:28 -0800
Subject: [PATCH 1/3] Polish

---
 .../audit/InMemoryAuditEventRepository.java        |  2 +-
 .../audit/InMemoryAuditEventRepositoryTests.java   |  2 +-
 .../BootGlobalAuthenticationConfiguration.java     | 14 +++++++++-----
 .../java/sample/HelloWebSecurityApplication.java   |  3 ++-
 .../sample/HelloWebSecurityApplicationTests.java   |  1 +
 .../ConfigurableEmbeddedServletContainer.java      |  2 +-
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java
index b17c76aa742..73d7d3c63f6 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java
+++ b/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.
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java
index 74dba50c3f8..0383e03051d 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java
+++ b/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.
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/BootGlobalAuthenticationConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/BootGlobalAuthenticationConfiguration.java
index f27245b7f59..2f656d3dd6d 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/BootGlobalAuthenticationConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/BootGlobalAuthenticationConfiguration.java
@@ -29,17 +29,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}.
- *
  * @author Rob Winch
  * @since 1.1.11
  */
@@ -73,5 +75,7 @@ public class BootGlobalAuthenticationConfiguration {
 				logger.debug("Eagerly initializing " + beansWithAnnotation);
 			}
 		}
+
 	}
+
 }
diff --git a/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java b/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java
index d14af0eef1b..58bd7e80f43 100644
--- a/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java
+++ b/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java
@@ -36,4 +36,5 @@ public class HelloWebSecurityApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(HelloWebSecurityApplication.class, args);
 	}
-}
\ No newline at end of file
+
+}
diff --git a/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java b/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java
index c7a77f0c08a..a234b1ed33e 100644
--- a/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java
+++ b/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java
@@ -74,4 +74,5 @@ public class HelloWebSecurityApplicationTests {
 
 		assertThat(this.response.getStatus(), equalTo(HttpServletResponse.SC_OK));
 	}
+
 }
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java
index 49c7088340b..380df42f9a8 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainer.java
+++ b/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.

From f0ef882ff279b5396fd3f45b0debe22b756c315d Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Mon, 23 Feb 2015 15:03:56 -0800
Subject: [PATCH 2/3] Filter integration tests to only pom folders

Update invoker configuration so that only folders with a pom.xml file
are invoked. This helps when switching between the 1.1.x and master
branches since empty folders left by git no longer fail the build.
---
 spring-boot-integration-tests/pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spring-boot-integration-tests/pom.xml b/spring-boot-integration-tests/pom.xml
index f362171370a..04808c9f146 100644
--- a/spring-boot-integration-tests/pom.xml
+++ b/spring-boot-integration-tests/pom.xml
@@ -51,6 +51,9 @@
 							<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
 							<skipInvocation>${skipTests}</skipInvocation>
 							<streamLogs>true</streamLogs>
+							<pomIncludes>
+								<pomInclude>*/pom.xml</pomInclude>
+							</pomIncludes>
 						</configuration>
 						<executions>
 							<execution>

From 7ac8cac3b5637639bd4efec6fba6ae791e27caa9 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Mon, 23 Feb 2015 16:53:53 -0800
Subject: [PATCH 3/3] Reorganize integration tests

Make spring-boot-integration-tests a top level project and move the
existing gradle tests and security tests to be sub-modules.
---
 spring-boot-dependencies/pom.xml              |   2 +-
 spring-boot-full-build/pom.xml                |   1 -
 spring-boot-integration-tests/pom.xml         |  34 +++----------
 .../spring-boot-gradle-tests/pom.xml          |  46 ++++++++++++++++++
 .../boot/gradle/ClassifierTests.java          |   0
 .../gradle/CustomVersionManagementTests.java  |   0
 .../boot/gradle/FlatdirTests.java             |   0
 .../boot/gradle/InstallTests.java             |   0
 .../boot/gradle/MainClassTests.java           |   0
 .../gradle/MultiProjectRepackagingTests.java  |   0
 .../boot/gradle/NoJarTests.java               |   0
 .../boot/gradle/ProjectCreator.java           |   0
 .../boot/gradle/RepackagingTests.java         |   0
 .../boot/gradle/SpringLoadedTests.java        |   0
 .../boot/gradle/WarPackagingTests.java        |   0
 .../StarterDependenciesIntegrationTests.java  |   2 +-
 .../resources/classifier-extension.gradle     |   0
 .../src/test/resources/classifier.gradle      |   0
 .../custom-version-management.gradle          |   0
 .../test/resources/custom-versions.properties |   0
 .../src/test/resources/flatdir.gradle         |   0
 .../src/test/resources/foo.jar                | Bin
 .../src/test/resources/install-app.gradle     |   0
 .../src/test/resources/installer-io.gradle    |   0
 .../src/test/resources/installer.gradle       |   0
 .../src/test/resources/main-in-run.gradle     |   0
 .../build.gradle                              |   0
 .../lib/foo.jar                               | Bin
 .../settings.gradle                           |   0
 .../build.gradle                              |   0
 .../settings.gradle                           |   0
 .../build.gradle                              |   0
 .../common/lib/foo.jar                        | Bin
 .../settings.gradle                           |   0
 .../src/test/resources/nojar.gradle           |   0
 .../src/test/resources/repackage.gradle       |   0
 .../spring-loaded-jvm-args/build.gradle       |   0
 .../src/main/java/test/Application.java       |   0
 .../spring-loaded-old-gradle/build.gradle     |   0
 .../src/main/java/test/Application.java       |   0
 .../resources/starter-dependencies.gradle     |   0
 .../src/test/resources/war-packaging.gradle   |   0
 .../spring-boot-security-tests}/pom.xml       |   6 ++-
 .../pom.xml                                   |   2 +-
 .../sample/HelloWebSecurityApplication.java   |   0
 .../HelloWebSecurityApplicationTests.java     |   0
 46 files changed, 61 insertions(+), 32 deletions(-)
 create mode 100644 spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/java/org/springframework/boot/gradle/ClassifierTests.java (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/java/org/springframework/boot/gradle/CustomVersionManagementTests.java (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/java/org/springframework/boot/gradle/FlatdirTests.java (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/java/org/springframework/boot/gradle/InstallTests.java (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/java/org/springframework/boot/gradle/MainClassTests.java (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/java/org/springframework/boot/gradle/MultiProjectRepackagingTests.java (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/java/org/springframework/boot/gradle/NoJarTests.java (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/java/org/springframework/boot/gradle/ProjectCreator.java (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/java/org/springframework/boot/gradle/RepackagingTests.java (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/java/org/springframework/boot/gradle/SpringLoadedTests.java (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java (97%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/classifier-extension.gradle (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/classifier.gradle (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/custom-version-management.gradle (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/custom-versions.properties (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/flatdir.gradle (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/foo.jar (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/install-app.gradle (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/installer-io.gradle (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/installer.gradle (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/main-in-run.gradle (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/multi-project-common-file-dependency/build.gradle (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/multi-project-common-file-dependency/lib/foo.jar (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/multi-project-common-file-dependency/settings.gradle (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/multi-project-runtime-project-dependency/build.gradle (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/multi-project-runtime-project-dependency/settings.gradle (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/multi-project-transitive-file-dependency/build.gradle (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/multi-project-transitive-file-dependency/common/lib/foo.jar (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/multi-project-transitive-file-dependency/settings.gradle (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/nojar.gradle (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/repackage.gradle (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/spring-loaded-jvm-args/build.gradle (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/spring-loaded-jvm-args/src/main/java/test/Application.java (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/spring-loaded-old-gradle/build.gradle (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/spring-loaded-old-gradle/src/main/java/test/Application.java (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/starter-dependencies.gradle (100%)
 rename spring-boot-integration-tests/{ => spring-boot-gradle-tests}/src/test/resources/war-packaging.gradle (100%)
 rename {spring-boot-security-tests => spring-boot-integration-tests/spring-boot-security-tests}/pom.xml (86%)
 rename {spring-boot-security-tests => spring-boot-integration-tests/spring-boot-security-tests}/spring-boot-security-tests-web-helloworld/pom.xml (96%)
 rename {spring-boot-security-tests => spring-boot-integration-tests/spring-boot-security-tests}/spring-boot-security-tests-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java (100%)
 rename {spring-boot-security-tests => spring-boot-integration-tests/spring-boot-security-tests}/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java (100%)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 7dfff3cf85a..3d31600f00d 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -1345,4 +1345,4 @@
 			</plugins>
 		</pluginManagement>
 	</build>
-</project>
+</project>
\ No newline at end of file
diff --git a/spring-boot-full-build/pom.xml b/spring-boot-full-build/pom.xml
index efd5bd098be..2ac52747d31 100644
--- a/spring-boot-full-build/pom.xml
+++ b/spring-boot-full-build/pom.xml
@@ -56,7 +56,6 @@
 		<module>../spring-boot-cli</module>
 		<module>../spring-boot-samples</module>
 		<module>../spring-boot-integration-tests</module>
-		<module>../spring-boot-security-tests</module>
 		<module>../spring-boot-docs</module>
 	</modules>
 	<profiles>
diff --git a/spring-boot-integration-tests/pom.xml b/spring-boot-integration-tests/pom.xml
index 04808c9f146..42774fdf18c 100644
--- a/spring-boot-integration-tests/pom.xml
+++ b/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,19 +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-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>
@@ -45,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>
@@ -69,6 +61,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
+						<inherited>false</inherited>
 						<executions>
 							<execution>
 								<id>clean-samples</id>
@@ -89,6 +82,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-clean-plugin</artifactId>
+						<inherited>false</inherited>
 						<executions>
 							<execution>
 								<id>clean-samples</id>
@@ -106,16 +100,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>
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml b/spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml
new file mode 100644
index 00000000000..1504156ab33
--- /dev/null
+++ b/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.1.11.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>
diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/ClassifierTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/ClassifierTests.java
similarity index 100%
rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/ClassifierTests.java
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/ClassifierTests.java
diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/CustomVersionManagementTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/CustomVersionManagementTests.java
similarity index 100%
rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/CustomVersionManagementTests.java
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/CustomVersionManagementTests.java
diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/FlatdirTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/FlatdirTests.java
similarity index 100%
rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/FlatdirTests.java
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/FlatdirTests.java
diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/InstallTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/InstallTests.java
similarity index 100%
rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/InstallTests.java
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/InstallTests.java
diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/MainClassTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/MainClassTests.java
similarity index 100%
rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/MainClassTests.java
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/MainClassTests.java
diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/MultiProjectRepackagingTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/MultiProjectRepackagingTests.java
similarity index 100%
rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/MultiProjectRepackagingTests.java
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/MultiProjectRepackagingTests.java
diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/NoJarTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/NoJarTests.java
similarity index 100%
rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/NoJarTests.java
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/NoJarTests.java
diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/ProjectCreator.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/ProjectCreator.java
similarity index 100%
rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/ProjectCreator.java
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/ProjectCreator.java
diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/RepackagingTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/RepackagingTests.java
similarity index 100%
rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/RepackagingTests.java
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/RepackagingTests.java
diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/SpringLoadedTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/SpringLoadedTests.java
similarity index 100%
rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/SpringLoadedTests.java
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/SpringLoadedTests.java
diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java
similarity index 100%
rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java
diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java
similarity index 97%
rename from spring-boot-integration-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java
index b7cfa637d7f..26245cd2f2b 100644
--- a/spring-boot-integration-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java
+++ b/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)
diff --git a/spring-boot-integration-tests/src/test/resources/classifier-extension.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/classifier-extension.gradle
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/classifier-extension.gradle
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/classifier-extension.gradle
diff --git a/spring-boot-integration-tests/src/test/resources/classifier.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/classifier.gradle
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/classifier.gradle
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/classifier.gradle
diff --git a/spring-boot-integration-tests/src/test/resources/custom-version-management.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/custom-version-management.gradle
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/custom-version-management.gradle
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/custom-version-management.gradle
diff --git a/spring-boot-integration-tests/src/test/resources/custom-versions.properties b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/custom-versions.properties
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/custom-versions.properties
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/custom-versions.properties
diff --git a/spring-boot-integration-tests/src/test/resources/flatdir.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/flatdir.gradle
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/flatdir.gradle
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/flatdir.gradle
diff --git a/spring-boot-integration-tests/src/test/resources/foo.jar b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/foo.jar
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/foo.jar
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/foo.jar
diff --git a/spring-boot-integration-tests/src/test/resources/install-app.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/install-app.gradle
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/install-app.gradle
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/install-app.gradle
diff --git a/spring-boot-integration-tests/src/test/resources/installer-io.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/installer-io.gradle
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/installer-io.gradle
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/installer-io.gradle
diff --git a/spring-boot-integration-tests/src/test/resources/installer.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/installer.gradle
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/installer.gradle
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/installer.gradle
diff --git a/spring-boot-integration-tests/src/test/resources/main-in-run.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/main-in-run.gradle
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/main-in-run.gradle
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/main-in-run.gradle
diff --git a/spring-boot-integration-tests/src/test/resources/multi-project-common-file-dependency/build.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-common-file-dependency/build.gradle
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/multi-project-common-file-dependency/build.gradle
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-common-file-dependency/build.gradle
diff --git a/spring-boot-integration-tests/src/test/resources/multi-project-common-file-dependency/lib/foo.jar b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-common-file-dependency/lib/foo.jar
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/multi-project-common-file-dependency/lib/foo.jar
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-common-file-dependency/lib/foo.jar
diff --git a/spring-boot-integration-tests/src/test/resources/multi-project-common-file-dependency/settings.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-common-file-dependency/settings.gradle
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/multi-project-common-file-dependency/settings.gradle
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-common-file-dependency/settings.gradle
diff --git a/spring-boot-integration-tests/src/test/resources/multi-project-runtime-project-dependency/build.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-runtime-project-dependency/build.gradle
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/multi-project-runtime-project-dependency/build.gradle
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-runtime-project-dependency/build.gradle
diff --git a/spring-boot-integration-tests/src/test/resources/multi-project-runtime-project-dependency/settings.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-runtime-project-dependency/settings.gradle
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/multi-project-runtime-project-dependency/settings.gradle
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-runtime-project-dependency/settings.gradle
diff --git a/spring-boot-integration-tests/src/test/resources/multi-project-transitive-file-dependency/build.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-transitive-file-dependency/build.gradle
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/multi-project-transitive-file-dependency/build.gradle
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-transitive-file-dependency/build.gradle
diff --git a/spring-boot-integration-tests/src/test/resources/multi-project-transitive-file-dependency/common/lib/foo.jar b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-transitive-file-dependency/common/lib/foo.jar
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/multi-project-transitive-file-dependency/common/lib/foo.jar
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-transitive-file-dependency/common/lib/foo.jar
diff --git a/spring-boot-integration-tests/src/test/resources/multi-project-transitive-file-dependency/settings.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-transitive-file-dependency/settings.gradle
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/multi-project-transitive-file-dependency/settings.gradle
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/multi-project-transitive-file-dependency/settings.gradle
diff --git a/spring-boot-integration-tests/src/test/resources/nojar.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/nojar.gradle
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/nojar.gradle
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/nojar.gradle
diff --git a/spring-boot-integration-tests/src/test/resources/repackage.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/repackage.gradle
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/repackage.gradle
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/repackage.gradle
diff --git a/spring-boot-integration-tests/src/test/resources/spring-loaded-jvm-args/build.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-jvm-args/build.gradle
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/spring-loaded-jvm-args/build.gradle
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-jvm-args/build.gradle
diff --git a/spring-boot-integration-tests/src/test/resources/spring-loaded-jvm-args/src/main/java/test/Application.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-jvm-args/src/main/java/test/Application.java
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/spring-loaded-jvm-args/src/main/java/test/Application.java
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-jvm-args/src/main/java/test/Application.java
diff --git a/spring-boot-integration-tests/src/test/resources/spring-loaded-old-gradle/build.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-old-gradle/build.gradle
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/spring-loaded-old-gradle/build.gradle
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-old-gradle/build.gradle
diff --git a/spring-boot-integration-tests/src/test/resources/spring-loaded-old-gradle/src/main/java/test/Application.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-old-gradle/src/main/java/test/Application.java
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/spring-loaded-old-gradle/src/main/java/test/Application.java
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/spring-loaded-old-gradle/src/main/java/test/Application.java
diff --git a/spring-boot-integration-tests/src/test/resources/starter-dependencies.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/starter-dependencies.gradle
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/starter-dependencies.gradle
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/starter-dependencies.gradle
diff --git a/spring-boot-integration-tests/src/test/resources/war-packaging.gradle b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/war-packaging.gradle
similarity index 100%
rename from spring-boot-integration-tests/src/test/resources/war-packaging.gradle
rename to spring-boot-integration-tests/spring-boot-gradle-tests/src/test/resources/war-packaging.gradle
diff --git a/spring-boot-security-tests/pom.xml b/spring-boot-integration-tests/spring-boot-security-tests/pom.xml
similarity index 86%
rename from spring-boot-security-tests/pom.xml
rename to spring-boot-integration-tests/spring-boot-security-tests/pom.xml
index ce335a6228d..bd4acb18f47 100644
--- a/spring-boot-security-tests/pom.xml
+++ b/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.1.11.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>
diff --git a/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/pom.xml b/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/pom.xml
similarity index 96%
rename from spring-boot-security-tests/spring-boot-security-tests-web-helloworld/pom.xml
rename to spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/pom.xml
index 81d38d0825d..893f5a0711d 100644
--- a/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/pom.xml
+++ b/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>
diff --git a/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java b/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java
similarity index 100%
rename from spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java
rename to spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/main/java/sample/HelloWebSecurityApplication.java
diff --git a/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java b/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java
similarity index 100%
rename from spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java
rename to spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java