From fcbf15aea3b2d43f93f29d990dc67a7dffaafc01 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Fri, 19 Feb 2016 15:00:25 +0000
Subject: [PATCH] Update Ant support following changes the executable jar
 layout

Closes gh-4897
---
 .../main/resources/org/springframework/boot/ant/antlib.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/spring-boot-tools/spring-boot-antlib/src/main/resources/org/springframework/boot/ant/antlib.xml b/spring-boot-tools/spring-boot-antlib/src/main/resources/org/springframework/boot/ant/antlib.xml
index 21237dc4ec1..010d04b2df1 100644
--- a/spring-boot-tools/spring-boot-antlib/src/main/resources/org/springframework/boot/ant/antlib.xml
+++ b/spring-boot-tools/spring-boot-antlib/src/main/resources/org/springframework/boot/ant/antlib.xml
@@ -60,11 +60,14 @@
 
 			<echo>Embedding spring-boot-loader v${spring-boot.version}...</echo>
 			<jar destfile="@{destfile}" compress="false">
-				<fileset dir="@{classes}" />
+				<mappedresources>
+					<fileset dir="@{classes}"/>
+					<globmapper from="*" to="BOOT-INF/classes/*" />
+				</mappedresources>
 				<resources />
 				<mappedresources>
 					<lib />
-					<globmapper from="*" to="lib/*" />
+					<globmapper from="*" to="BOOT-INF/lib/*" />
 				</mappedresources>
 				<zipfileset src="${destdir}/dependency/spring-boot-loader.jar" />
 				<manifest>