Skip to content

Commit 7ac8cac

Browse files
philwebbphilwebb
committed
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.
1 parent f0ef882 commit 7ac8cac

File tree

46 files changed

+61
-32
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+61
-32
lines changed

‎spring-boot-dependencies/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1345,4 +1345,4 @@
13451345
</plugins>
13461346
</pluginManagement>
13471347
</build>
1348-
</project>
1348+
</project>

‎spring-boot-full-build/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
<module>../spring-boot-cli</module>
5757
<module>../spring-boot-samples</module>
5858
<module>../spring-boot-integration-tests</module>
59-
<module>../spring-boot-security-tests</module>
6059
<module>../spring-boot-docs</module>
6160
</modules>
6261
<profiles>

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

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<relativePath>../spring-boot-parent</relativePath>
99
</parent>
1010
<artifactId>spring-boot-integration-tests</artifactId>
11-
<packaging>jar</packaging>
11+
<packaging>pom</packaging>
1212
<name>Spring Boot Integration Tests</name>
1313
<description>Spring Boot Integration Tests</description>
1414
<url>http://projects.spring.io/spring-boot/</url>
@@ -19,19 +19,10 @@
1919
<properties>
2020
<main.basedir>${basedir}/..</main.basedir>
2121
</properties>
22-
<dependencies>
23-
<dependency>
24-
<groupId>org.gradle</groupId>
25-
<artifactId>gradle-tooling-api</artifactId>
26-
<version>${gradle.version}</version>
27-
<scope>test</scope>
28-
</dependency>
29-
<dependency>
30-
<groupId>org.springframework.boot</groupId>
31-
<artifactId>spring-boot-dependency-tools</artifactId>
32-
<scope>test</scope>
33-
</dependency>
34-
</dependencies>
22+
<modules>
23+
<module>spring-boot-gradle-tests</module>
24+
<module>spring-boot-security-tests</module>
25+
</modules>
3526
<profiles>
3627
<profile>
3728
<id>default</id>
@@ -45,6 +36,7 @@
4536
is available -->
4637
<groupId>org.apache.maven.plugins</groupId>
4738
<artifactId>maven-invoker-plugin</artifactId>
39+
<inherited>false</inherited>
4840
<configuration>
4941
<settingsFile>src/it/settings.xml</settingsFile>
5042
<projectsDirectory>${main.basedir}/spring-boot-samples/</projectsDirectory>
@@ -69,6 +61,7 @@
6961
<plugin>
7062
<groupId>org.apache.maven.plugins</groupId>
7163
<artifactId>maven-antrun-plugin</artifactId>
64+
<inherited>false</inherited>
7265
<executions>
7366
<execution>
7467
<id>clean-samples</id>
@@ -89,6 +82,7 @@
8982
<plugin>
9083
<groupId>org.apache.maven.plugins</groupId>
9184
<artifactId>maven-clean-plugin</artifactId>
85+
<inherited>false</inherited>
9286
<executions>
9387
<execution>
9488
<id>clean-samples</id>
@@ -106,16 +100,4 @@
106100
<id>full</id>
107101
</profile>
108102
</profiles>
109-
<repositories>
110-
<repository>
111-
<id>gradle</id>
112-
<url>http://repo.gradle.org/gradle/libs-releases-local</url>
113-
<releases>
114-
<enabled>true</enabled>
115-
</releases>
116-
<snapshots>
117-
<enabled>false</enabled>
118-
</snapshots>
119-
</repository>
120-
</repositories>
121103
</project>

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

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>org.springframework.boot</groupId>
6+
<artifactId>spring-boot-integration-tests</artifactId>
7+
<version>1.1.11.BUILD-SNAPSHOT</version>
8+
</parent>
9+
<artifactId>spring-boot-gradle-tests</artifactId>
10+
<packaging>jar</packaging>
11+
<name>Spring Boot Gradle Integration Tests</name>
12+
<description>Spring Boot Gradle Integration Tests</description>
13+
<url>http://projects.spring.io/spring-boot/</url>
14+
<organization>
15+
<name>Pivotal Software, Inc.</name>
16+
<url>http://www.spring.io</url>
17+
</organization>
18+
<properties>
19+
<main.basedir>${basedir}/../..</main.basedir>
20+
</properties>
21+
<dependencies>
22+
<dependency>
23+
<groupId>org.gradle</groupId>
24+
<artifactId>gradle-tooling-api</artifactId>
25+
<version>${gradle.version}</version>
26+
<scope>test</scope>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.springframework.boot</groupId>
30+
<artifactId>spring-boot-dependency-tools</artifactId>
31+
<scope>test</scope>
32+
</dependency>
33+
</dependencies>
34+
<repositories>
35+
<repository>
36+
<id>gradle</id>
37+
<url>http://repo.gradle.org/gradle/libs-releases-local</url>
38+
<releases>
39+
<enabled>true</enabled>
40+
</releases>
41+
<snapshots>
42+
<enabled>false</enabled>
43+
</snapshots>
44+
</repository>
45+
</repositories>
46+
</project>

‎spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/ClassifierTests.java‎ renamed to ‎spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/ClassifierTests.java‎

File renamed without changes.

‎spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/CustomVersionManagementTests.java‎ renamed to ‎spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/CustomVersionManagementTests.java‎

File renamed without changes.

‎spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/FlatdirTests.java‎ renamed to ‎spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/FlatdirTests.java‎

File renamed without changes.

‎spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/InstallTests.java‎ renamed to ‎spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/InstallTests.java‎

File renamed without changes.

‎spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/MainClassTests.java‎ renamed to ‎spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/MainClassTests.java‎

File renamed without changes.

‎spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/MultiProjectRepackagingTests.java‎ renamed to ‎spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/MultiProjectRepackagingTests.java‎

File renamed without changes.

0 commit comments

Comments
 (0)