mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '1.5.x'
This commit is contained in:
commit
f049fea00d
2
pom.xml
2
pom.xml
@ -81,7 +81,6 @@
|
||||
<module>spring-boot-dependencies</module>
|
||||
<module>spring-boot-parent</module>
|
||||
<module>spring-boot-tools</module>
|
||||
<module>spring-boot-test-support</module>
|
||||
<module>spring-boot</module>
|
||||
<module>spring-boot-test</module>
|
||||
<module>spring-boot-autoconfigure</module>
|
||||
@ -114,7 +113,6 @@
|
||||
<modules>
|
||||
<module>spring-boot-dependencies</module>
|
||||
<module>spring-boot-parent</module>
|
||||
<module>spring-boot-test-support</module>
|
||||
<module>spring-boot-tools</module>
|
||||
</modules>
|
||||
<build>
|
||||
|
@ -20,13 +20,14 @@
|
||||
<main.basedir>${basedir}/..</main.basedir>
|
||||
</properties>
|
||||
<modules>
|
||||
<module>spring-boot-antlib</module>
|
||||
<module>spring-boot-autoconfigure-processor</module>
|
||||
<module>spring-boot-configuration-metadata</module>
|
||||
<module>spring-boot-configuration-processor</module>
|
||||
<module>spring-boot-gradle-plugin</module>
|
||||
<module>spring-boot-loader</module>
|
||||
<module>spring-boot-loader-tools</module>
|
||||
<module>spring-boot-maven-plugin</module>
|
||||
<module>spring-boot-gradle-plugin</module>
|
||||
<module>spring-boot-antlib</module>
|
||||
<module>spring-boot-test-support</module>
|
||||
</modules>
|
||||
</project>
|
||||
|
@ -4,9 +4,8 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-parent</artifactId>
|
||||
<artifactId>spring-boot-tools</artifactId>
|
||||
<version>2.0.0.BUILD-SNAPSHOT</version>
|
||||
<relativePath>../spring-boot-parent</relativePath>
|
||||
</parent>
|
||||
<artifactId>spring-boot-test-support</artifactId>
|
||||
<name>Spring Boot Testing Support</name>
|
||||
@ -17,7 +16,7 @@
|
||||
<url>http://www.spring.io</url>
|
||||
</organization>
|
||||
<properties>
|
||||
<main.basedir>${basedir}/..</main.basedir>
|
||||
<main.basedir>${basedir}/../..</main.basedir>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<!-- Provided -->
|
Loading…
Reference in New Issue
Block a user