Skip to content

S
spring-boot
Commit 7ac8cac3 authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

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.
parent f0ef882f
Show whitespace changes
Inline Side-by-side
Showing with 61 additions and 32 deletions
spring-boot-full-build/pom.xml
View file @ 7ac8cac3
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
<module>../spring-boot-cli</module> <module>../spring-boot-cli</module>
<module>../spring-boot-samples</module> <module>../spring-boot-samples</module>
<module>../spring-boot-integration-tests</module> <module>../spring-boot-integration-tests</module>
<module>../spring-boot-security-tests</module>
<module>../spring-boot-docs</module> <module>../spring-boot-docs</module>
</modules> </modules>
<profiles> <profiles>
......
spring-boot-integration-tests/pom.xml
View file @ 7ac8cac3
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<relativePath>../spring-boot-parent</relativePath> <relativePath>../spring-boot-parent</relativePath>
</parent> </parent>
<artifactId>spring-boot-integration-tests</artifactId> <artifactId>spring-boot-integration-tests</artifactId>
<packaging>jar</packaging> <packaging>pom</packaging>
<name>Spring Boot Integration Tests</name> <name>Spring Boot Integration Tests</name>
<description>Spring Boot Integration Tests</description> <description>Spring Boot Integration Tests</description>
<url>http://projects.spring.io/spring-boot/</url> <url>http://projects.spring.io/spring-boot/</url>
...@@ -19,19 +19,10 @@ ...@@ -19,19 +19,10 @@
<properties> <properties>
<main.basedir>${basedir}/..</main.basedir> <main.basedir>${basedir}/..</main.basedir>
</properties> </properties>
<dependencies> <modules>
<dependency> <module>spring-boot-gradle-tests</module>
<groupId>org.gradle</groupId> <module>spring-boot-security-tests</module>
<artifactId>gradle-tooling-api</artifactId> </modules>
<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>
<profiles> <profiles>
<profile> <profile>
<id>default</id> <id>default</id>
...@@ -45,6 +36,7 @@ ...@@ -45,6 +36,7 @@
is available --> is available -->
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId> <artifactId>maven-invoker-plugin</artifactId>
<inherited>false</inherited>
<configuration> <configuration>
<settingsFile>src/it/settings.xml</settingsFile> <settingsFile>src/it/settings.xml</settingsFile>
<projectsDirectory>${main.basedir}/spring-boot-samples/</projectsDirectory> <projectsDirectory>${main.basedir}/spring-boot-samples/</projectsDirectory>
...@@ -69,6 +61,7 @@ ...@@ -69,6 +61,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<inherited>false</inherited>
<executions> <executions>
<execution> <execution>
<id>clean-samples</id> <id>clean-samples</id>
...@@ -89,6 +82,7 @@ ...@@ -89,6 +82,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId> <artifactId>maven-clean-plugin</artifactId>
<inherited>false</inherited>
<executions> <executions>
<execution> <execution>
<id>clean-samples</id> <id>clean-samples</id>
...@@ -106,16 +100,4 @@ ...@@ -106,16 +100,4 @@
<id>full</id> <id>full</id>
</profile> </profile>
</profiles> </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> </project>
spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml 0 → 100644
View file @ 7ac8cac3
<?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>
spring-boot-integration-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java → spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java
View file @ 7ac8cac3
...@@ -60,7 +60,7 @@ public class StarterDependenciesIntegrationTests { ...@@ -60,7 +60,7 @@ public class StarterDependenciesIntegrationTests {
@Parameters @Parameters
public static List<String[]> getStarters() { public static List<String[]> getStarters() {
List<String[]> starters = new ArrayList<String[]>(); 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()) { if (file.isDirectory() && new File(file, "pom.xml").exists()) {
String name = file.getName(); String name = file.getName();
if (name.startsWith(STARTER_NAME_PREFIX) if (name.startsWith(STARTER_NAME_PREFIX)
......
spring-boot-security-tests/pom.xml → spring-boot-integration-tests/spring-boot-security-tests/pom.xml
View file @ 7ac8cac3
...@@ -3,9 +3,8 @@ ...@@ -3,9 +3,8 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-parent</artifactId> <artifactId>spring-boot-integration-tests</artifactId>
<version>1.1.11.BUILD-SNAPSHOT</version> <version>1.1.11.BUILD-SNAPSHOT</version>
<relativePath>../spring-boot-parent</relativePath>
</parent> </parent>
<artifactId>spring-boot-security-tests</artifactId> <artifactId>spring-boot-security-tests</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
...@@ -16,6 +15,9 @@ ...@@ -16,6 +15,9 @@
<name>Pivotal Software, Inc.</name> <name>Pivotal Software, Inc.</name>
<url>http://www.spring.io</url> <url>http://www.spring.io</url>
</organization> </organization>
<properties>
<main.basedir>${basedir}/..</main.basedir>
</properties>
<modules> <modules>
<module>spring-boot-security-tests-web-helloworld</module> <module>spring-boot-security-tests-web-helloworld</module>
</modules> </modules>
......
spring-boot-security-tests/spring-boot-security-tests-web-helloworld/pom.xml → spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/pom.xml
View file @ 7ac8cac3
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<url>http://www.spring.io</url> <url>http://www.spring.io</url>
</organization> </organization>
<properties> <properties>
<main.basedir>${basedir}/../..</main.basedir> <main.basedir>${basedir}/../../..</main.basedir>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment