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.
Eviradnus · Feb 24, 2015 · 7ac8cac · 7ac8cac
1 parent f0ef882
commit 7ac8cac
Show file tree

Hide file tree

Showing 46 changed files with 61 additions and 32 deletions.
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
@@ -1345,4 +1345,4 @@
 			</plugins>
 		</pluginManagement>
 	</build>
-</project>
+</project>
diff --git 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
@@ -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
@@ -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/...ramework/boot/gradle/ClassifierTests.java → ...ramework/boot/gradle/ClassifierTests.java b/...ramework/boot/gradle/ClassifierTests.java → ...ramework/boot/gradle/ClassifierTests.java
diff --git a/.../gradle/CustomVersionManagementTests.java → .../gradle/CustomVersionManagementTests.java b/.../gradle/CustomVersionManagementTests.java → .../gradle/CustomVersionManagementTests.java
diff --git a/...ngframework/boot/gradle/FlatdirTests.java → ...ngframework/boot/gradle/FlatdirTests.java b/...ngframework/boot/gradle/FlatdirTests.java → ...ngframework/boot/gradle/FlatdirTests.java
diff --git a/...ngframework/boot/gradle/InstallTests.java → ...ngframework/boot/gradle/InstallTests.java b/...ngframework/boot/gradle/InstallTests.java → ...ngframework/boot/gradle/InstallTests.java
diff --git a/...framework/boot/gradle/MainClassTests.java → ...framework/boot/gradle/MainClassTests.java b/...framework/boot/gradle/MainClassTests.java → ...framework/boot/gradle/MainClassTests.java
diff --git a/.../gradle/MultiProjectRepackagingTests.java → .../gradle/MultiProjectRepackagingTests.java b/.../gradle/MultiProjectRepackagingTests.java → .../gradle/MultiProjectRepackagingTests.java
diff --git a/...ringframework/boot/gradle/NoJarTests.java → ...ringframework/boot/gradle/NoJarTests.java b/...ringframework/boot/gradle/NoJarTests.java → ...ringframework/boot/gradle/NoJarTests.java
diff --git a/...framework/boot/gradle/ProjectCreator.java → ...framework/boot/gradle/ProjectCreator.java b/...framework/boot/gradle/ProjectCreator.java → ...framework/boot/gradle/ProjectCreator.java
diff --git a/...amework/boot/gradle/RepackagingTests.java → ...amework/boot/gradle/RepackagingTests.java b/...amework/boot/gradle/RepackagingTests.java → ...amework/boot/gradle/RepackagingTests.java
diff --git a/...mework/boot/gradle/SpringLoadedTests.java → ...mework/boot/gradle/SpringLoadedTests.java b/...mework/boot/gradle/SpringLoadedTests.java → ...mework/boot/gradle/SpringLoadedTests.java
diff --git a/...mework/boot/gradle/WarPackagingTests.java → ...mework/boot/gradle/WarPackagingTests.java b/...mework/boot/gradle/WarPackagingTests.java → ...mework/boot/gradle/WarPackagingTests.java
diff --git a/.../StarterDependenciesIntegrationTests.java → .../StarterDependenciesIntegrationTests.java b/.../StarterDependenciesIntegrationTests.java → .../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/...est/resources/classifier-extension.gradle → ...est/resources/classifier-extension.gradle b/...est/resources/classifier-extension.gradle → ...est/resources/classifier-extension.gradle
diff --git a/...ests/src/test/resources/classifier.gradle → ...ests/src/test/resources/classifier.gradle b/...ests/src/test/resources/classifier.gradle → ...ests/src/test/resources/classifier.gradle
diff --git a/...esources/custom-version-management.gradle → ...esources/custom-version-management.gradle b/...esources/custom-version-management.gradle → ...esources/custom-version-management.gradle
diff --git a/...test/resources/custom-versions.properties → ...test/resources/custom-versions.properties b/...test/resources/custom-versions.properties → ...test/resources/custom-versions.properties
diff --git a/...n-tests/src/test/resources/flatdir.gradle → ...e-tests/src/test/resources/flatdir.gradle b/...n-tests/src/test/resources/flatdir.gradle → ...e-tests/src/test/resources/flatdir.gradle
diff --git a/...egration-tests/src/test/resources/foo.jar → ...t-gradle-tests/src/test/resources/foo.jar b/...egration-tests/src/test/resources/foo.jar → ...t-gradle-tests/src/test/resources/foo.jar
diff --git a/...sts/src/test/resources/install-app.gradle → ...sts/src/test/resources/install-app.gradle b/...sts/src/test/resources/install-app.gradle → ...sts/src/test/resources/install-app.gradle
diff --git a/...ts/src/test/resources/installer-io.gradle → ...ts/src/test/resources/installer-io.gradle b/...ts/src/test/resources/installer-io.gradle → ...ts/src/test/resources/installer-io.gradle
diff --git a/...tests/src/test/resources/installer.gradle → ...tests/src/test/resources/installer.gradle b/...tests/src/test/resources/installer.gradle → ...tests/src/test/resources/installer.gradle
diff --git a/...sts/src/test/resources/main-in-run.gradle → ...sts/src/test/resources/main-in-run.gradle b/...sts/src/test/resources/main-in-run.gradle → ...sts/src/test/resources/main-in-run.gradle
diff --git a/...oject-common-file-dependency/build.gradle → ...oject-common-file-dependency/build.gradle b/...oject-common-file-dependency/build.gradle → ...oject-common-file-dependency/build.gradle
diff --git a/...roject-common-file-dependency/lib/foo.jar → ...roject-common-file-dependency/lib/foo.jar b/...roject-common-file-dependency/lib/foo.jar → ...roject-common-file-dependency/lib/foo.jar
diff --git a/...ct-common-file-dependency/settings.gradle → ...ct-common-file-dependency/settings.gradle b/...ct-common-file-dependency/settings.gradle → ...ct-common-file-dependency/settings.gradle
diff --git a/...t-runtime-project-dependency/build.gradle → ...t-runtime-project-dependency/build.gradle b/...t-runtime-project-dependency/build.gradle → ...t-runtime-project-dependency/build.gradle
diff --git a/...untime-project-dependency/settings.gradle → ...untime-project-dependency/settings.gradle b/...untime-project-dependency/settings.gradle → ...untime-project-dependency/settings.gradle
diff --git a/...t-transitive-file-dependency/build.gradle → ...t-transitive-file-dependency/build.gradle b/...t-transitive-file-dependency/build.gradle → ...t-transitive-file-dependency/build.gradle
diff --git a/...sitive-file-dependency/common/lib/foo.jar → ...sitive-file-dependency/common/lib/foo.jar b/...sitive-file-dependency/common/lib/foo.jar → ...sitive-file-dependency/common/lib/foo.jar
diff --git a/...ransitive-file-dependency/settings.gradle → ...ransitive-file-dependency/settings.gradle b/...ransitive-file-dependency/settings.gradle → ...ransitive-file-dependency/settings.gradle
diff --git a/...ion-tests/src/test/resources/nojar.gradle → ...dle-tests/src/test/resources/nojar.gradle b/...ion-tests/src/test/resources/nojar.gradle → ...dle-tests/src/test/resources/nojar.gradle
diff --git a/...tests/src/test/resources/repackage.gradle → ...tests/src/test/resources/repackage.gradle b/...tests/src/test/resources/repackage.gradle → ...tests/src/test/resources/repackage.gradle
diff --git a/...urces/spring-loaded-jvm-args/build.gradle → ...urces/spring-loaded-jvm-args/build.gradle b/...urces/spring-loaded-jvm-args/build.gradle → ...urces/spring-loaded-jvm-args/build.gradle
diff --git a/...-args/src/main/java/test/Application.java → ...-args/src/main/java/test/Application.java b/...-args/src/main/java/test/Application.java → ...-args/src/main/java/test/Application.java
diff --git a/...ces/spring-loaded-old-gradle/build.gradle → ...ces/spring-loaded-old-gradle/build.gradle b/...ces/spring-loaded-old-gradle/build.gradle → ...ces/spring-loaded-old-gradle/build.gradle
diff --git a/...radle/src/main/java/test/Application.java → ...radle/src/main/java/test/Application.java b/...radle/src/main/java/test/Application.java → ...radle/src/main/java/test/Application.java
diff --git a/...est/resources/starter-dependencies.gradle → ...est/resources/starter-dependencies.gradle b/...est/resources/starter-dependencies.gradle → ...est/resources/starter-dependencies.gradle
diff --git a/...s/src/test/resources/war-packaging.gradle → ...s/src/test/resources/war-packaging.gradle b/...s/src/test/resources/war-packaging.gradle → ...s/src/test/resources/war-packaging.gradle
diff --git a/spring-boot-security-tests/pom.xml → ...-tests/spring-boot-security-tests/pom.xml b/spring-boot-security-tests/pom.xml → ...-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/...oot-security-tests-web-helloworld/pom.xml → ...oot-security-tests-web-helloworld/pom.xml b/...oot-security-tests-web-helloworld/pom.xml → ...oot-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/...a/sample/HelloWebSecurityApplication.java → ...a/sample/HelloWebSecurityApplication.java b/...a/sample/HelloWebSecurityApplication.java → ...a/sample/HelloWebSecurityApplication.java
diff --git a/...ple/HelloWebSecurityApplicationTests.java → ...ple/HelloWebSecurityApplicationTests.java b/...ple/HelloWebSecurityApplicationTests.java → ...ple/HelloWebSecurityApplicationTests.java