root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Disable deployment tests when building with Java 9

Browse Source 
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
pull/10382/merge
Andy Wilkinson 7 years ago
parent d9600bd4b0
commit ae979465b6
5 changed files with 264 additions and 229 deletions
Show Stats Download Patch File Download Diff File

123
spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml
Unescape Escape View File

@ -47,64 +47,71 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <profiles>
<plugins> <profile>
<plugin> <activation>
<groupId>org.codehaus.mojo</groupId> <jdk>1.8</jdk>
<artifactId>build-helper-maven-plugin</artifactId> </activation>
<executions> <build>
<execution> <plugins>
<id>reserve-network-port</id> <plugin>
<goals> <groupId>org.codehaus.mojo</groupId>
<goal>reserve-network-port</goal> <artifactId>build-helper-maven-plugin</artifactId>
</goals> <executions>
<phase>process-resources</phase> <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> <configuration>
<portNames> <configuration>
<portName>appserver.port</portName> <properties>
<portName>appserver.admin.port</portName> <cargo.servlet.port>${appserver.port}</cargo.servlet.port>
<portName>appserver.jms.port</portName> <cargo.glassfish.admin.port>${appserver.admin.port}</cargo.glassfish.admin.port>
<portName>appserver.iiop.port</portName> <cargo.glassfish.domain.jmxPort>${appserver.jmx.port}</cargo.glassfish.domain.jmxPort>
<portName>appserver.https.port</portName> <cargo.glassfish.http.ssl.port>${appserver.https.port}</cargo.glassfish.http.ssl.port>
<portName>appserver.iiops.port</portName> <cargo.glassfish.java.debugger.port>${appserver.debugger.port}</cargo.glassfish.java.debugger.port>
<portName>appserver.iiopmutualauth.port</portName> <cargo.glassfish.jms.port>${appserver.jms.port}</cargo.glassfish.jms.port>
<portName>appserver.jmx.port</portName> <cargo.glassfish.orb.listener.port>${appserver.iiop.port}</cargo.glassfish.orb.listener.port>
<portName>appserver.osgishell.port</portName> <cargo.glassfish.orb.mutualauth.port>${appserver.iiopmutualauth.port}</cargo.glassfish.orb.mutualauth.port>
<portName>appserver.debugger.port</portName> <cargo.glassfish.orb.ssl.port>${appserver.iiops.port}</cargo.glassfish.orb.ssl.port>
</portNames> <cargo.glassfish.osgi.shell.telnet.port>${appserver.osgishell.port}</cargo.glassfish.osgi.shell.telnet.port>
</properties>
</configuration>
</configuration> </configuration>
</execution> </plugin>
</executions> <plugin>
</plugin> <groupId>org.apache.maven.plugins</groupId>
<plugin> <artifactId>maven-failsafe-plugin</artifactId>
<groupId>org.codehaus.cargo</groupId> <configuration>
<artifactId>cargo-maven2-plugin</artifactId> <systemPropertyVariables>
<configuration> <port>${appserver.port}</port>
<configuration> </systemPropertyVariables>
<properties> </configuration>
<cargo.servlet.port>${appserver.port}</cargo.servlet.port> </plugin>
<cargo.glassfish.admin.port>${appserver.admin.port}</cargo.glassfish.admin.port> </plugins>
<cargo.glassfish.domain.jmxPort>${appserver.jmx.port}</cargo.glassfish.domain.jmxPort> </build>
<cargo.glassfish.http.ssl.port>${appserver.https.port}</cargo.glassfish.http.ssl.port> </profile>
<cargo.glassfish.java.debugger.port>${appserver.debugger.port}</cargo.glassfish.java.debugger.port> </profiles>
<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>
</project> </project>

91
spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml
Unescape Escape View File

@ -44,48 +44,55 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <profiles>
<plugins> <profile>
<plugin> <activation>
<groupId>org.codehaus.mojo</groupId> <jdk>1.8</jdk>
<artifactId>build-helper-maven-plugin</artifactId> </activation>
<executions> <build>
<execution> <plugins>
<id>reserve-network-port</id> <plugin>
<goals> <groupId>org.codehaus.mojo</groupId>
<goal>reserve-network-port</goal> <artifactId>build-helper-maven-plugin</artifactId>
</goals> <executions>
<phase>process-resources</phase> <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> <configuration>
<portNames> <configuration>
<portName>appserver.port</portName> <properties>
<portName>appserver.ajp.port</portName> <cargo.servlet.port>${appserver.port}</cargo.servlet.port>
</portNames> <cargo.tomcat.ajp.port>${appserver.ajp.port}</cargo.tomcat.ajp.port>
</properties>
</configuration>
</configuration> </configuration>
</execution> </plugin>
</executions> <plugin>
</plugin> <groupId>org.apache.maven.plugins</groupId>
<plugin> <artifactId>maven-failsafe-plugin</artifactId>
<groupId>org.codehaus.cargo</groupId> <configuration>
<artifactId>cargo-maven2-plugin</artifactId> <systemPropertyVariables>
<configuration> <port>${appserver.port}</port>
<configuration> </systemPropertyVariables>
<properties> </configuration>
<cargo.servlet.port>${appserver.port}</cargo.servlet.port> </plugin>
<cargo.tomcat.ajp.port>${appserver.ajp.port}</cargo.tomcat.ajp.port> </plugins>
</properties> </build>
</configuration> </profile>
</configuration> </profiles>
</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> </project>

91
spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml
Unescape Escape View File

@ -49,48 +49,55 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <profiles>
<plugins> <profile>
<plugin> <activation>
<groupId>org.codehaus.mojo</groupId> <jdk>1.8</jdk>
<artifactId>build-helper-maven-plugin</artifactId> </activation>
<executions> <build>
<execution> <plugins>
<id>reserve-network-port</id> <plugin>
<goals> <groupId>org.codehaus.mojo</groupId>
<goal>reserve-network-port</goal> <artifactId>build-helper-maven-plugin</artifactId>
</goals> <executions>
<phase>process-resources</phase> <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> <configuration>
<portNames> <configuration>
<portName>appserver.port</portName> <properties>
<portName>appserver.ajp.port</portName> <cargo.servlet.port>${appserver.port}</cargo.servlet.port>
</portNames> <cargo.tomcat.ajp.port>${appserver.ajp.port}</cargo.tomcat.ajp.port>
</properties>
</configuration>
</configuration> </configuration>
</execution> </plugin>
</executions> <plugin>
</plugin> <groupId>org.apache.maven.plugins</groupId>
<plugin> <artifactId>maven-failsafe-plugin</artifactId>
<groupId>org.codehaus.cargo</groupId> <configuration>
<artifactId>cargo-maven2-plugin</artifactId> <systemPropertyVariables>
<configuration> <port>${appserver.port}</port>
<configuration> </systemPropertyVariables>
<properties> </configuration>
<cargo.servlet.port>${appserver.port}</cargo.servlet.port> </plugin>
<cargo.tomcat.ajp.port>${appserver.ajp.port}</cargo.tomcat.ajp.port> </plugins>
</properties> </build>
</configuration> </profile>
</configuration> </profiles>
</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> </project>

101
spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml
Unescape Escape View File

@ -44,53 +44,60 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <profiles>
<plugins> <profile>
<plugin> <activation>
<groupId>org.codehaus.mojo</groupId> <jdk>1.8</jdk>
<artifactId>build-helper-maven-plugin</artifactId> </activation>
<executions> <build>
<execution> <plugins>
<id>reserve-network-port</id> <plugin>
<goals> <groupId>org.codehaus.mojo</groupId>
<goal>reserve-network-port</goal> <artifactId>build-helper-maven-plugin</artifactId>
</goals> <executions>
<phase>process-resources</phase> <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> <configuration>
<portNames> <configuration>
<portName>appserver.port</portName> <properties>
<portName>appserver.ajp.port</portName> <cargo.servlet.port>${appserver.port}</cargo.servlet.port>
<portName>appserver.transaction.port</portName> <cargo.jboss.ajp.port>${appserver.ajp.port}</cargo.jboss.ajp.port>
</portNames> <cargo.jboss.transaction.statusManager.port>
${appserver.transaction.port}
</cargo.jboss.transaction.statusManager.port>
<cargo.jboss.configuration>standalone-full</cargo.jboss.configuration>
</properties>
</configuration>
</configuration> </configuration>
</execution> </plugin>
</executions> <plugin>
</plugin> <groupId>org.apache.maven.plugins</groupId>
<plugin> <artifactId>maven-failsafe-plugin</artifactId>
<groupId>org.codehaus.cargo</groupId> <configuration>
<artifactId>cargo-maven2-plugin</artifactId> <systemPropertyVariables>
<configuration> <port>${appserver.port}</port>
<configuration> </systemPropertyVariables>
<properties> </configuration>
<cargo.servlet.port>${appserver.port}</cargo.servlet.port> </plugin>
<cargo.jboss.ajp.port>${appserver.ajp.port}</cargo.jboss.ajp.port> </plugins>
<cargo.jboss.transaction.statusManager.port> </build>
${appserver.transaction.port} </profile>
</cargo.jboss.transaction.statusManager.port> </profiles>
<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> </project>

87
spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml
Unescape Escape View File

@ -43,46 +43,53 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <profiles>
<plugins> <profile>
<plugin> <activation>
<groupId>org.codehaus.mojo</groupId> <jdk>1.8</jdk>
<artifactId>build-helper-maven-plugin</artifactId> </activation>
<executions> <build>
<execution> <plugins>
<id>reserve-network-port</id> <plugin>
<goals> <groupId>org.codehaus.mojo</groupId>
<goal>reserve-network-port</goal> <artifactId>build-helper-maven-plugin</artifactId>
</goals> <executions>
<phase>process-resources</phase> <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> <configuration>
<portNames> <configuration>
<portName>appserver.port</portName> <properties>
</portNames> <cargo.servlet.port>${appserver.port}</cargo.servlet.port>
</properties>
</configuration>
</configuration> </configuration>
</execution> </plugin>
</executions> <plugin>
</plugin> <groupId>org.apache.maven.plugins</groupId>
<plugin> <artifactId>maven-failsafe-plugin</artifactId>
<groupId>org.codehaus.cargo</groupId> <configuration>
<artifactId>cargo-maven2-plugin</artifactId> <systemPropertyVariables>
<configuration> <port>${appserver.port}</port>
<configuration> </systemPropertyVariables>
<properties> </configuration>
<cargo.servlet.port>${appserver.port}</cargo.servlet.port> </plugin>
</properties> </plugins>
</configuration> </build>
</configuration> </profile>
</plugin> </profiles>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<port>${appserver.port}</port>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

Write Preview
Loading…
Cancel
Save