From c24c5aeb3b40a6c06083e703bb9b86b05449cb3f Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Fri, 1 Jul 2016 14:21:23 +0100
Subject: [PATCH] Upgrade to Maven Assembly Plugin 2.6

Closes gh-6291
---
 spring-boot-cli/src/main/assembly/bin-package.xml | 2 +-
 spring-boot-dependencies/pom.xml                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-boot-cli/src/main/assembly/bin-package.xml b/spring-boot-cli/src/main/assembly/bin-package.xml
index 399b11a2b5..95608c4879 100644
--- a/spring-boot-cli/src/main/assembly/bin-package.xml
+++ b/spring-boot-cli/src/main/assembly/bin-package.xml
@@ -26,7 +26,7 @@
 	<files>
 		<file>
 			<source>${project.build.directory}/${project.artifactId}-${project.version}-full.jar</source>
-			<outputDirectory>/spring-${project.version}/lib</outputDirectory>
+			<outputDirectory>/lib</outputDirectory>
 			<destName>${project.build.finalName}.jar</destName>
 		</file>
 	</files>
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 48b65074d2..e4958b4090 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -2411,7 +2411,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>2.5.1</version>
+					<version>2.6</version>
 					<configuration>
 						<recompressZippedFiles>false</recompressZippedFiles>
 					</configuration>