Merge branch '2.2.x'

Closes gh-19554
This commit is contained in:
Andy Wilkinson 2020-01-07 12:06:07 +00:00
commit 30c124f549

View File

@ -34,17 +34,6 @@
<local name="spring-boot.version" />
<loadproperties prefix="spring-boot">
<javaresource
name="META-INF/maven/org.springframework.boot/spring-boot-antlib/pom.properties"
loaderref="spring.boot.antlib.loader" />
<filterchain>
<linecontainsregexp>
<regexp pattern="^version=" />
</linecontainsregexp>
</filterchain>
</loadproperties>
<local name="destdir" />
<dirname file="@{destfile}" property="destdir" />