From e8aa3a3a8e3edec6778e8db72f81a958f418f9ba Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Mon, 29 May 2017 16:16:43 +0200
Subject: [PATCH] Upgrade to Maven War Plugin 3.1.0

Closes gh-9344
---
 spring-boot-dependencies/pom.xml                               | 2 +-
 spring-boot-parent/pom.xml                                     | 3 ---
 spring-boot-starters/spring-boot-starter-parent/pom.xml        | 1 -
 .../spring-boot-loader/src/it/executable-war/pom.xml           | 1 -
 .../spring-boot-maven-plugin/src/it/war-reactor/war/pom.xml    | 1 -
 .../spring-boot-maven-plugin/src/it/war-with-unpack/pom.xml    | 1 -
 spring-boot-tools/spring-boot-maven-plugin/src/it/war/pom.xml  | 1 -
 7 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 1626432cb2..517ae142dd 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -212,7 +212,7 @@
 		<maven-site-plugin.version>3.5.1</maven-site-plugin.version>
 		<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
 		<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
-		<maven-war-plugin.version>2.6</maven-war-plugin.version>
+		<maven-war-plugin.version>3.1.0</maven-war-plugin.version>
 		<versions-maven-plugin.version>2.3</versions-maven-plugin.version>
 	</properties>
 	<dependencyManagement>
diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml
index 79a3fba493..4348a6659f 100644
--- a/spring-boot-parent/pom.xml
+++ b/spring-boot-parent/pom.xml
@@ -580,9 +580,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<configuration>
-					<failOnMissingWebXml>false</failOnMissingWebXml>
-				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-starters/spring-boot-starter-parent/pom.xml
index a39cafcfe3..cd2fb452c6 100644
--- a/spring-boot-starters/spring-boot-starter-parent/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-parent/pom.xml
@@ -104,7 +104,6 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-war-plugin</artifactId>
 					<configuration>
-						<failOnMissingWebXml>false</failOnMissingWebXml>
 						<archive>
 							<manifest>
 								<mainClass>${start-class}</mainClass>
diff --git a/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml b/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml
index c96a0771bf..b9e92cbf6f 100644
--- a/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml
+++ b/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml
@@ -33,7 +33,6 @@
 							<Start-Class>org.springframework.boot.load.it.war.embedded.EmbeddedWarStarter</Start-Class>
 						</manifestEntries>
 					</archive>
-					<failOnMissingWebXml>false</failOnMissingWebXml>
 				</configuration>
 			</plugin>
 			<plugin>
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/war-reactor/war/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/war-reactor/war/pom.xml
index f274b77001..845d73c68b 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/it/war-reactor/war/pom.xml
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/war-reactor/war/pom.xml
@@ -29,7 +29,6 @@
 				<artifactId>maven-war-plugin</artifactId>
 				<version>@maven-war-plugin.version@</version>
 				<configuration>
-					<failOnMissingWebXml>false</failOnMissingWebXml>
 					<archive>
 						<manifestEntries>
 							<Not-Used>Foo</Not-Used>
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/war-with-unpack/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/war-with-unpack/pom.xml
index 6b3c6c9be3..9eb8ec6099 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/it/war-with-unpack/pom.xml
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/war-with-unpack/pom.xml
@@ -38,7 +38,6 @@
 				<artifactId>maven-war-plugin</artifactId>
 				<version>@maven-war-plugin.version@</version>
 				<configuration>
-					<failOnMissingWebXml>false</failOnMissingWebXml>
 					<archive>
 						<manifestEntries>
 							<Not-Used>Foo</Not-Used>
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/war/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/war/pom.xml
index cf857210b1..14d4fc6408 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/it/war/pom.xml
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/war/pom.xml
@@ -30,7 +30,6 @@
 				<artifactId>maven-war-plugin</artifactId>
 				<version>@maven-war-plugin.version@</version>
 				<configuration>
-					<failOnMissingWebXml>false</failOnMissingWebXml>
 					<archive>
 						<manifestEntries>
 							<Not-Used>Foo</Not-Used>