From ae979465b6d89007606ae7e45bf1b60a1a1d1237 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Mon, 25 Sep 2017 06:59:45 +0100
Subject: [PATCH] Disable deployment tests when building with Java 9

Cargo in currently incompatible with Java 9 so this commit disables
the deployment tests that use Cargo when building with Java 9.

Closes gh-10413
---
 .../pom.xml                                   | 123 +++++++++---------
 .../pom.xml                                   |  91 +++++++------
 .../spring-boot-deployment-test-tomee/pom.xml |  91 +++++++------
 .../pom.xml                                   | 101 +++++++-------
 .../spring-boot-deployment-test-wlp/pom.xml   |  87 +++++++------
 5 files changed, 264 insertions(+), 229 deletions(-)

diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml b/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml
index 5f64c9b633..8a60594133 100644
--- a/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml
+++ b/spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml
@@ -47,64 +47,71 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	<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>
+	<profiles>
+		<profile>
+			<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.admin.port</portName>
+										<portName>appserver.jms.port</portName>
+										<portName>appserver.iiop.port</portName>
+										<portName>appserver.https.port</portName>
+										<portName>appserver.iiops.port</portName>
+										<portName>appserver.iiopmutualauth.port</portName>
+										<portName>appserver.jmx.port</portName>
+										<portName>appserver.osgishell.port</portName>
+										<portName>appserver.debugger.port</portName>
+									</portNames>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.codehaus.cargo</groupId>
+						<artifactId>cargo-maven2-plugin</artifactId>
 						<configuration>
-							<portNames>
-								<portName>appserver.port</portName>
-								<portName>appserver.admin.port</portName>
-								<portName>appserver.jms.port</portName>
-								<portName>appserver.iiop.port</portName>
-								<portName>appserver.https.port</portName>
-								<portName>appserver.iiops.port</portName>
-								<portName>appserver.iiopmutualauth.port</portName>
-								<portName>appserver.jmx.port</portName>
-								<portName>appserver.osgishell.port</portName>
-								<portName>appserver.debugger.port</portName>
-							</portNames>
+							<configuration>
+								<properties>
+									<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
+									<cargo.glassfish.admin.port>${appserver.admin.port}</cargo.glassfish.admin.port>
+									<cargo.glassfish.domain.jmxPort>${appserver.jmx.port}</cargo.glassfish.domain.jmxPort>
+									<cargo.glassfish.http.ssl.port>${appserver.https.port}</cargo.glassfish.http.ssl.port>
+									<cargo.glassfish.java.debugger.port>${appserver.debugger.port}</cargo.glassfish.java.debugger.port>
+									<cargo.glassfish.jms.port>${appserver.jms.port}</cargo.glassfish.jms.port>
+									<cargo.glassfish.orb.listener.port>${appserver.iiop.port}</cargo.glassfish.orb.listener.port>
+									<cargo.glassfish.orb.mutualauth.port>${appserver.iiopmutualauth.port}</cargo.glassfish.orb.mutualauth.port>
+									<cargo.glassfish.orb.ssl.port>${appserver.iiops.port}</cargo.glassfish.orb.ssl.port>
+									<cargo.glassfish.osgi.shell.telnet.port>${appserver.osgishell.port}</cargo.glassfish.osgi.shell.telnet.port>
+								</properties>
+							</configuration>
 						</configuration>
-					</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.glassfish.admin.port>${appserver.admin.port}</cargo.glassfish.admin.port>
-							<cargo.glassfish.domain.jmxPort>${appserver.jmx.port}</cargo.glassfish.domain.jmxPort>
-							<cargo.glassfish.http.ssl.port>${appserver.https.port}</cargo.glassfish.http.ssl.port>
-							<cargo.glassfish.java.debugger.port>${appserver.debugger.port}</cargo.glassfish.java.debugger.port>
-							<cargo.glassfish.jms.port>${appserver.jms.port}</cargo.glassfish.jms.port>
-							<cargo.glassfish.orb.listener.port>${appserver.iiop.port}</cargo.glassfish.orb.listener.port>
-							<cargo.glassfish.orb.mutualauth.port>${appserver.iiopmutualauth.port}</cargo.glassfish.orb.mutualauth.port>
-							<cargo.glassfish.orb.ssl.port>${appserver.iiops.port}</cargo.glassfish.orb.ssl.port>
-							<cargo.glassfish.osgi.shell.telnet.port>${appserver.osgishell.port}</cargo.glassfish.osgi.shell.telnet.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>
+					</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>
 </project>
diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml b/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml
index a5c603be8e..70583cdc83 100644
--- a/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml
+++ b/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml
@@ -44,48 +44,55 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	<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>
+	<profiles>
+		<profile>
+			<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>
 						<configuration>
-							<portNames>
-								<portName>appserver.port</portName>
-								<portName>appserver.ajp.port</portName>
-							</portNames>
+							<configuration>
+								<properties>
+									<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
+									<cargo.tomcat.ajp.port>${appserver.ajp.port}</cargo.tomcat.ajp.port>
+								</properties>
+							</configuration>
 						</configuration>
-					</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>
+					</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>
 </project>
diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml b/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml
index 55bd2226fc..ac3ab6f1f7 100644
--- a/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml
+++ b/spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml
@@ -49,48 +49,55 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	<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>
+	<profiles>
+		<profile>
+			<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>
 						<configuration>
-							<portNames>
-								<portName>appserver.port</portName>
-								<portName>appserver.ajp.port</portName>
-							</portNames>
+							<configuration>
+								<properties>
+									<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
+									<cargo.tomcat.ajp.port>${appserver.ajp.port}</cargo.tomcat.ajp.port>
+								</properties>
+							</configuration>
 						</configuration>
-					</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>
+					</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>
 </project>
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 4c6effca3e..1fdce26590 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
@@ -44,53 +44,60 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	<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>
+	<profiles>
+		<profile>
+			<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>
 						<configuration>
-							<portNames>
-								<portName>appserver.port</portName>
-								<portName>appserver.ajp.port</portName>
-								<portName>appserver.transaction.port</portName>
-							</portNames>
+							<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>
-					</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>
+					</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>
 </project>
diff --git a/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml b/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml
index f2c3e205b3..520b433f4a 100644
--- a/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml
+++ b/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml
@@ -43,46 +43,53 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	<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>
+	<profiles>
+		<profile>
+			<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>
 						<configuration>
-							<portNames>
-								<portName>appserver.port</portName>
-							</portNames>
+							<configuration>
+								<properties>
+									<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
+								</properties>
+							</configuration>
 						</configuration>
-					</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>
+					</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>
 </project>