From dc8a34f324eeb05d2679cab3eee08a3379f51b53 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 3 May 2017 16:47:38 +0100
Subject: [PATCH] Fix warnings caused by CLI's assembly configuration

Closes gh-9080
---
 spring-boot-cli/src/main/assembly/bin-package.xml        | 9 ++++-----
 .../src/main/assembly/jar-with-dependencies.xml          | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/spring-boot-cli/src/main/assembly/bin-package.xml b/spring-boot-cli/src/main/assembly/bin-package.xml
index 0dd415c9e1..ecba6fd1ce 100644
--- a/spring-boot-cli/src/main/assembly/bin-package.xml
+++ b/spring-boot-cli/src/main/assembly/bin-package.xml
@@ -2,7 +2,6 @@
 	<id>bin</id>
 	<formats>
 		<format>zip</format>
-		<format>dir</format>
 		<format>tar.gz</format>
 	</formats>
 	<baseDirectory>spring-${project.version}</baseDirectory>
@@ -10,7 +9,7 @@
 	<fileSets>
 		<fileSet>
 			<directory>src/main/content</directory>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory></outputDirectory>
 			<useDefaultExcludes>true</useDefaultExcludes>
 			<fileMode>644</fileMode>
 			<directoryMode>755</directoryMode>
@@ -21,7 +20,7 @@
 		</fileSet>
 		<fileSet>
 			<directory>src/main/content</directory>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory></outputDirectory>
 			<useDefaultExcludes>true</useDefaultExcludes>
 			<fileMode>644</fileMode>
 			<directoryMode>755</directoryMode>
@@ -31,7 +30,7 @@
 		</fileSet>
 		<fileSet>
 			<directory>src/main/executablecontent</directory>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory></outputDirectory>
 			<useDefaultExcludes>true</useDefaultExcludes>
 			<fileMode>755</fileMode>
 			<directoryMode>755</directoryMode>
@@ -40,7 +39,7 @@
 	<files>
 		<file>
 			<source>${project.build.directory}/${project.artifactId}-${project.version}-full.jar</source>
-			<outputDirectory>/lib</outputDirectory>
+			<outputDirectory>lib</outputDirectory>
 			<destName>${project.build.finalName}.jar</destName>
 		</file>
 	</files>
diff --git a/spring-boot-cli/src/main/assembly/jar-with-dependencies.xml b/spring-boot-cli/src/main/assembly/jar-with-dependencies.xml
index b0687983c0..a6b4733911 100644
--- a/spring-boot-cli/src/main/assembly/jar-with-dependencies.xml
+++ b/spring-boot-cli/src/main/assembly/jar-with-dependencies.xml
@@ -21,7 +21,7 @@
 	<fileSets>
 		<fileSet>
 			<directory>${project.build.directory}/assembly</directory>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory></outputDirectory>
 		</fileSet>
 	</fileSets>
 </assembly>