From aa27334671d9739f22cf13a2855039b87ea5a937 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 4 Apr 2018 14:48:58 +0100
Subject: [PATCH] Run deployment tests on JDK 9 and 10 where possible

Closes gh-10414
---
 .../spring-boot-parent/pom.xml                |   2 +-
 .../pom.xml                                   |  92 +++++++--------
 .../pom.xml                                   | 106 ++++++++----------
 .../WEB-INF/jboss-deployment-structure.xml    |   2 +
 .../spring-boot-deployment-test-wlp/pom.xml   |  90 +++++++--------
 5 files changed, 135 insertions(+), 157 deletions(-)

diff --git a/spring-boot-project/spring-boot-parent/pom.xml b/spring-boot-project/spring-boot-parent/pom.xml
index 72c31c2c59..20f003efb6 100644
--- a/spring-boot-project/spring-boot-parent/pom.xml
+++ b/spring-boot-project/spring-boot-parent/pom.xml
@@ -343,7 +343,7 @@
 				<plugin>
 					<groupId>org.codehaus.cargo</groupId>
 					<artifactId>cargo-maven2-plugin</artifactId>
-					<version>1.6.4</version>
+					<version>1.6.7</version>
 				</plugin>
 				<plugin>
 					<groupId>org.codehaus.gmavenplus</groupId>
diff --git a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml
index e3242b6f5b..867dc61bfd 100644
--- a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml
+++ b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml
@@ -43,56 +43,48 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	<profiles>
-		<profile>
-			<id>jdk8</id>
-			<activation>
-				<jdk>1.8</jdk>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>build-helper-maven-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>reserve-network-port</id>
-								<goals>
-									<goal>reserve-network-port</goal>
-								</goals>
-								<phase>process-resources</phase>
-								<configuration>
-									<portNames>
-										<portName>appserver.port</portName>
-										<portName>appserver.ajp.port</portName>
-									</portNames>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.codehaus.cargo</groupId>
-						<artifactId>cargo-maven2-plugin</artifactId>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>reserve-network-port</id>
+						<goals>
+							<goal>reserve-network-port</goal>
+						</goals>
+						<phase>process-resources</phase>
 						<configuration>
-							<configuration>
-								<properties>
-									<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
-									<cargo.tomcat.ajp.port>${appserver.ajp.port}</cargo.tomcat.ajp.port>
-								</properties>
-							</configuration>
+							<portNames>
+								<portName>appserver.port</portName>
+								<portName>appserver.ajp.port</portName>
+							</portNames>
 						</configuration>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-failsafe-plugin</artifactId>
-						<configuration>
-							<systemPropertyVariables>
-								<port>${appserver.port}</port>
-							</systemPropertyVariables>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.cargo</groupId>
+				<artifactId>cargo-maven2-plugin</artifactId>
+				<configuration>
+					<configuration>
+						<properties>
+							<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
+							<cargo.tomcat.ajp.port>${appserver.ajp.port}</cargo.tomcat.ajp.port>
+						</properties>
+					</configuration>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<configuration>
+					<systemPropertyVariables>
+						<port>${appserver.port}</port>
+					</systemPropertyVariables>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml
index 6b0aace3dc..fa65949863 100644
--- a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml
+++ b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml
@@ -12,8 +12,8 @@
 	<description>Spring Boot WildFly Deployment Test</description>
 	<properties>
 		<main.basedir>${basedir}/../../..</main.basedir>
-		<wildfly.version>9.0.2.Final</wildfly.version>
-		<cargo.container.id>wildfly9x</cargo.container.id>
+		<wildfly.version>12.0.0.Final</wildfly.version>
+		<cargo.container.id>wildfly12x</cargo.container.id>
 		<cargo.container.url>http://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip
 		</cargo.container.url>
 	</properties>
@@ -43,61 +43,53 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	<profiles>
-		<profile>
-			<id>jdk8</id>
-			<activation>
-				<jdk>1.8</jdk>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>build-helper-maven-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>reserve-network-port</id>
-								<goals>
-									<goal>reserve-network-port</goal>
-								</goals>
-								<phase>process-resources</phase>
-								<configuration>
-									<portNames>
-										<portName>appserver.port</portName>
-										<portName>appserver.ajp.port</portName>
-										<portName>appserver.transaction.port</portName>
-									</portNames>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.codehaus.cargo</groupId>
-						<artifactId>cargo-maven2-plugin</artifactId>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>reserve-network-port</id>
+						<goals>
+							<goal>reserve-network-port</goal>
+						</goals>
+						<phase>process-resources</phase>
 						<configuration>
-							<configuration>
-								<properties>
-									<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
-									<cargo.jboss.ajp.port>${appserver.ajp.port}</cargo.jboss.ajp.port>
-									<cargo.jboss.transaction.statusManager.port>
-										${appserver.transaction.port}
-									</cargo.jboss.transaction.statusManager.port>
-									<cargo.jboss.configuration>standalone-full</cargo.jboss.configuration>
-								</properties>
-							</configuration>
+							<portNames>
+								<portName>appserver.port</portName>
+								<portName>appserver.ajp.port</portName>
+								<portName>appserver.transaction.port</portName>
+							</portNames>
 						</configuration>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-failsafe-plugin</artifactId>
-						<configuration>
-							<systemPropertyVariables>
-								<port>${appserver.port}</port>
-							</systemPropertyVariables>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.cargo</groupId>
+				<artifactId>cargo-maven2-plugin</artifactId>
+				<configuration>
+					<configuration>
+						<properties>
+							<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
+							<cargo.jboss.ajp.port>${appserver.ajp.port}</cargo.jboss.ajp.port>
+							<cargo.jboss.transaction.statusManager.port>
+								${appserver.transaction.port}
+							</cargo.jboss.transaction.statusManager.port>
+							<cargo.jboss.configuration>standalone-full</cargo.jboss.configuration>
+						</properties>
+					</configuration>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<configuration>
+					<systemPropertyVariables>
+						<port>${appserver.port}</port>
+					</systemPropertyVariables>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
index 0736426bd1..5e5bd73881 100644
--- a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
+++ b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -5,6 +5,8 @@
 			<module name="com.fasterxml.jackson.core.jackson-annotations" />
 			<module name="com.fasterxml.jackson.core.jackson-core" />
 			<module name="com.fasterxml.jackson.core.jackson-databind" />
+			<module name="com.fasterxml.jackson.datatype.jackson-datatype-jdk8"/>
+ 			<module name="com.fasterxml.jackson.datatype.jackson-datatype-jsr310"/>
 			<module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" />
 			<module name="org.jboss.resteasy.resteasy-jackson2-provider" />
 			<module name="org.slf4j" />
diff --git a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml
index 6824f8c37e..df11c3aa37 100644
--- a/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml
+++ b/spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml
@@ -12,7 +12,7 @@
 	<description>Spring Boot WebSphere Liberty Profile Deployment Test</description>
 	<properties>
 		<main.basedir>${basedir}/../../..</main.basedir>
-		<wlp.version>16.0.0.4</wlp.version>
+		<wlp.version>18.0.0.1</wlp.version>
 		<cargo.container.id>liberty</cargo.container.id>
 		<cargo.container.url>https://repo.maven.apache.org/maven2/com/ibm/websphere/appserver/runtime/wlp-webProfile7/${wlp.version}/wlp-webProfile7-${wlp.version}.zip</cargo.container.url>
 	</properties>
@@ -42,54 +42,46 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	<profiles>
-		<profile>
-			<id>jdk8</id>
-			<activation>
-				<jdk>1.8</jdk>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>build-helper-maven-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>reserve-network-port</id>
-								<goals>
-									<goal>reserve-network-port</goal>
-								</goals>
-								<phase>process-resources</phase>
-								<configuration>
-									<portNames>
-										<portName>appserver.port</portName>
-									</portNames>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.codehaus.cargo</groupId>
-						<artifactId>cargo-maven2-plugin</artifactId>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>reserve-network-port</id>
+						<goals>
+							<goal>reserve-network-port</goal>
+						</goals>
+						<phase>process-resources</phase>
 						<configuration>
-							<configuration>
-								<properties>
-									<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
-								</properties>
-							</configuration>
+							<portNames>
+								<portName>appserver.port</portName>
+							</portNames>
 						</configuration>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-failsafe-plugin</artifactId>
-						<configuration>
-							<systemPropertyVariables>
-								<port>${appserver.port}</port>
-							</systemPropertyVariables>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.cargo</groupId>
+				<artifactId>cargo-maven2-plugin</artifactId>
+				<configuration>
+					<configuration>
+						<properties>
+							<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
+						</properties>
+					</configuration>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<configuration>
+					<systemPropertyVariables>
+						<port>${appserver.port}</port>
+					</systemPropertyVariables>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>