From 99683dff6f7aba612be1b196eed68a657e3386a6 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 22 Feb 2017 11:33:30 +0000
Subject: [PATCH] Upgrade to Logback 1.1.10

In Logback 1.1.10, the logback-classic module contains a
META-INF/services/javax.servlet.ServletContainerInitializer file that
contains a comment. This triggers a bug in Wildfly 8 [1] that has been
fixed [2] in Wildfly 9 and later. As a result, this commit also
updates our Wildfly deployment test to use 9.0.2 rather than 8.2.0.

Closes gh-8354

[1] https://issues.jboss.org/browse/WFLY-4089
[2] https://github.com/wildfly/wildfly/commit/fef57ebdc7f93fe975d9234dd86265b79d705ce2
---
 spring-boot-dependencies/pom.xml                              | 2 +-
 .../spring-boot-deployment-test-wildfly/pom.xml               | 4 ++--
 spring-boot-parent/pom.xml                                    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 50635e7ee05..1fa69ca52df 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -124,7 +124,7 @@
 		<junit.version>4.12</junit.version>
 		<liquibase.version>3.5.3</liquibase.version>
 		<log4j2.version>2.6.2</log4j2.version>
-		<logback.version>1.1.9</logback.version>
+		<logback.version>1.1.10</logback.version>
 		<lombok.version>1.16.14</lombok.version>
 		<mariadb.version>1.4.6</mariadb.version>
 		<mockito.version>1.10.19</mockito.version>
diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml b/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml
index ca13d88a138..4481f607f2e 100644
--- a/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml
+++ b/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml
@@ -17,8 +17,8 @@
 	</organization>
 	<properties>
 		<main.basedir>${basedir}/../..</main.basedir>
-		<wildfly.version>8.2.0.Final</wildfly.version>
-		<cargo.container.id>wildfly8x</cargo.container.id>
+		<wildfly.version>9.0.2.Final</wildfly.version>
+		<cargo.container.id>wildfly9x</cargo.container.id>
 		<cargo.container.url>http://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip
 		</cargo.container.url>
 	</properties>
diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml
index 5891ab6494d..d4694666d05 100644
--- a/spring-boot-parent/pom.xml
+++ b/spring-boot-parent/pom.xml
@@ -329,7 +329,7 @@
 				<plugin>
 					<groupId>org.codehaus.cargo</groupId>
 					<artifactId>cargo-maven2-plugin</artifactId>
-					<version>1.4.15</version>
+					<version>1.6.2</version>
 				</plugin>
 				<plugin>
 					<groupId>org.codehaus.gmavenplus</groupId>