Merge branch '2.1.x' into 2.2.x

Closes gh-19553
6 years ago · c57359ea3b
1 changed files with 0 additions and 11 deletions
--- a/spring-boot-project/spring-boot-tools/spring-boot-antlib/src/main/resources/org/springframework/boot/ant/antlib.xml
+++ b/spring-boot-project/spring-boot-tools/spring-boot-antlib/src/main/resources/org/springframework/boot/ant/antlib.xml
@ -34,17 +34,6 @@
				@@ -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" />