Merge branch '2.1.x'

Closes gh-18476
This commit is contained in:
Andy Wilkinson
2019-10-02 10:48:57 +01:00
75 changed files with 376 additions and 3 deletions

View File

@@ -14,6 +14,11 @@
<properties>
<main.basedir>${basedir}/../..</main.basedir>
</properties>
<scm>
<url>${git.url}</url>
<connection>${git.connection}</connection>
<developerConnection>${git.developerConnection}</developerConnection>
</scm>
<modules>
<module>spring-boot-antlib</module>
<module>spring-boot-autoconfigure-processor</module>

View File

@@ -14,6 +14,11 @@
<main.basedir>${basedir}/../../..</main.basedir>
<ant.version>1.9.3</ant.version>
</properties>
<scm>
<url>${git.url}</url>
<connection>${git.connection}</connection>
<developerConnection>${git.developerConnection}</developerConnection>
</scm>
<dependencies>
<!-- Compile -->
<dependency>

View File

@@ -13,6 +13,11 @@
<properties>
<main.basedir>${basedir}/../../..</main.basedir>
</properties>
<scm>
<url>${git.url}</url>
<connection>${git.connection}</connection>
<developerConnection>${git.developerConnection}</developerConnection>
</scm>
<dependencies>
<!-- Test -->
<dependency>

View File

@@ -12,6 +12,11 @@
<properties>
<main.basedir>${basedir}/../../..</main.basedir>
</properties>
<scm>
<url>${git.url}</url>
<connection>${git.connection}</connection>
<developerConnection>${git.developerConnection}</developerConnection>
</scm>
<dependencies>
<!-- Compile (should stick to the bare minimum) -->
<dependency>

View File

@@ -13,6 +13,11 @@
<properties>
<main.basedir>${basedir}/../../..</main.basedir>
</properties>
<scm>
<url>${git.url}</url>
<connection>${git.connection}</connection>
<developerConnection>${git.developerConnection}</developerConnection>
</scm>
<dependencies>
<!-- Test -->
<dependency>

View File

@@ -17,6 +17,11 @@
<gradle.task>build</gradle.task>
<refdocs.build.directory>${project.build.directory}/refdocs/</refdocs.build.directory>
</properties>
<scm>
<url>${git.url}</url>
<connection>${git.connection}</connection>
<developerConnection>${git.developerConnection}</developerConnection>
</scm>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>

View File

@@ -12,6 +12,11 @@
<properties>
<main.basedir>${basedir}/../../..</main.basedir>
</properties>
<scm>
<url>${git.url}</url>
<connection>${git.connection}</connection>
<developerConnection>${git.developerConnection}</developerConnection>
</scm>
<dependencies>
<!-- Compile -->
<dependency>

View File

@@ -13,6 +13,11 @@
<properties>
<main.basedir>${basedir}/../../..</main.basedir>
</properties>
<scm>
<url>${git.url}</url>
<connection>${git.connection}</connection>
<developerConnection>${git.developerConnection}</developerConnection>
</scm>
<dependencies>
<!-- Optional (must never have compile/runtime time dependencies) -->
<dependency>

View File

@@ -15,6 +15,11 @@
<main.basedir>${basedir}/../../..</main.basedir>
<maven.version>3.3.9</maven.version>
</properties>
<scm>
<url>${git.url}</url>
<connection>${git.connection}</connection>
<developerConnection>${git.developerConnection}</developerConnection>
</scm>
<dependencies>
<!-- Compile -->
<dependency>

View File

@@ -13,6 +13,11 @@
<properties>
<main.basedir>${basedir}/../../..</main.basedir>
</properties>
<scm>
<url>${git.url}</url>
<connection>${git.connection}</connection>
<developerConnection>${git.developerConnection}</developerConnection>
</scm>
<dependencies>
<!-- Compile -->
<dependency>