Skip to content

Commit ae97946

Browse files
wilkinsonawilkinsona
committed
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
1 parent d9600bd commit ae97946

File tree

5 files changed

+264
-229
lines changed
  • spring-boot-deployment-tests
    • spring-boot-deployment-test-glassfish
    • spring-boot-deployment-test-tomcat
    • spring-boot-deployment-test-tomee
    • spring-boot-deployment-test-wildfly
    • spring-boot-deployment-test-wlp

5 files changed

+264
-229
lines changed

‎spring-boot-deployment-tests/spring-boot-deployment-test-glassfish/pom.xml

Lines changed: 65 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -47,64 +47,71 @@
4747
<scope>test</scope>
4848
</dependency>
4949
</dependencies>
50-
<build>
51-
<plugins>
52-
<plugin>
53-
<groupId>org.codehaus.mojo</groupId>
54-
<artifactId>build-helper-maven-plugin</artifactId>
55-
<executions>
56-
<execution>
57-
<id>reserve-network-port</id>
58-
<goals>
59-
<goal>reserve-network-port</goal>
60-
</goals>
61-
<phase>process-resources</phase>
50+
<profiles>
51+
<profile>
52+
<activation>
53+
<jdk>1.8</jdk>
54+
</activation>
55+
<build>
56+
<plugins>
57+
<plugin>
58+
<groupId>org.codehaus.mojo</groupId>
59+
<artifactId>build-helper-maven-plugin</artifactId>
60+
<executions>
61+
<execution>
62+
<id>reserve-network-port</id>
63+
<goals>
64+
<goal>reserve-network-port</goal>
65+
</goals>
66+
<phase>process-resources</phase>
67+
<configuration>
68+
<portNames>
69+
<portName>appserver.port</portName>
70+
<portName>appserver.admin.port</portName>
71+
<portName>appserver.jms.port</portName>
72+
<portName>appserver.iiop.port</portName>
73+
<portName>appserver.https.port</portName>
74+
<portName>appserver.iiops.port</portName>
75+
<portName>appserver.iiopmutualauth.port</portName>
76+
<portName>appserver.jmx.port</portName>
77+
<portName>appserver.osgishell.port</portName>
78+
<portName>appserver.debugger.port</portName>
79+
</portNames>
80+
</configuration>
81+
</execution>
82+
</executions>
83+
</plugin>
84+
<plugin>
85+
<groupId>org.codehaus.cargo</groupId>
86+
<artifactId>cargo-maven2-plugin</artifactId>
6287
<configuration>
63-
<portNames>
64-
<portName>appserver.port</portName>
65-
<portName>appserver.admin.port</portName>
66-
<portName>appserver.jms.port</portName>
67-
<portName>appserver.iiop.port</portName>
68-
<portName>appserver.https.port</portName>
69-
<portName>appserver.iiops.port</portName>
70-
<portName>appserver.iiopmutualauth.port</portName>
71-
<portName>appserver.jmx.port</portName>
72-
<portName>appserver.osgishell.port</portName>
73-
<portName>appserver.debugger.port</portName>
74-
</portNames>
88+
<configuration>
89+
<properties>
90+
<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
91+
<cargo.glassfish.admin.port>${appserver.admin.port}</cargo.glassfish.admin.port>
92+
<cargo.glassfish.domain.jmxPort>${appserver.jmx.port}</cargo.glassfish.domain.jmxPort>
93+
<cargo.glassfish.http.ssl.port>${appserver.https.port}</cargo.glassfish.http.ssl.port>
94+
<cargo.glassfish.java.debugger.port>${appserver.debugger.port}</cargo.glassfish.java.debugger.port>
95+
<cargo.glassfish.jms.port>${appserver.jms.port}</cargo.glassfish.jms.port>
96+
<cargo.glassfish.orb.listener.port>${appserver.iiop.port}</cargo.glassfish.orb.listener.port>
97+
<cargo.glassfish.orb.mutualauth.port>${appserver.iiopmutualauth.port}</cargo.glassfish.orb.mutualauth.port>
98+
<cargo.glassfish.orb.ssl.port>${appserver.iiops.port}</cargo.glassfish.orb.ssl.port>
99+
<cargo.glassfish.osgi.shell.telnet.port>${appserver.osgishell.port}</cargo.glassfish.osgi.shell.telnet.port>
100+
</properties>
101+
</configuration>
75102
</configuration>
76-
</execution>
77-
</executions>
78-
</plugin>
79-
<plugin>
80-
<groupId>org.codehaus.cargo</groupId>
81-
<artifactId>cargo-maven2-plugin</artifactId>
82-
<configuration>
83-
<configuration>
84-
<properties>
85-
<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
86-
<cargo.glassfish.admin.port>${appserver.admin.port}</cargo.glassfish.admin.port>
87-
<cargo.glassfish.domain.jmxPort>${appserver.jmx.port}</cargo.glassfish.domain.jmxPort>
88-
<cargo.glassfish.http.ssl.port>${appserver.https.port}</cargo.glassfish.http.ssl.port>
89-
<cargo.glassfish.java.debugger.port>${appserver.debugger.port}</cargo.glassfish.java.debugger.port>
90-
<cargo.glassfish.jms.port>${appserver.jms.port}</cargo.glassfish.jms.port>
91-
<cargo.glassfish.orb.listener.port>${appserver.iiop.port}</cargo.glassfish.orb.listener.port>
92-
<cargo.glassfish.orb.mutualauth.port>${appserver.iiopmutualauth.port}</cargo.glassfish.orb.mutualauth.port>
93-
<cargo.glassfish.orb.ssl.port>${appserver.iiops.port}</cargo.glassfish.orb.ssl.port>
94-
<cargo.glassfish.osgi.shell.telnet.port>${appserver.osgishell.port}</cargo.glassfish.osgi.shell.telnet.port>
95-
</properties>
96-
</configuration>
97-
</configuration>
98-
</plugin>
99-
<plugin>
100-
<groupId>org.apache.maven.plugins</groupId>
101-
<artifactId>maven-failsafe-plugin</artifactId>
102-
<configuration>
103-
<systemPropertyVariables>
104-
<port>${appserver.port}</port>
105-
</systemPropertyVariables>
106-
</configuration>
107-
</plugin>
108-
</plugins>
109-
</build>
103+
</plugin>
104+
<plugin>
105+
<groupId>org.apache.maven.plugins</groupId>
106+
<artifactId>maven-failsafe-plugin</artifactId>
107+
<configuration>
108+
<systemPropertyVariables>
109+
<port>${appserver.port}</port>
110+
</systemPropertyVariables>
111+
</configuration>
112+
</plugin>
113+
</plugins>
114+
</build>
115+
</profile>
116+
</profiles>
110117
</project>

‎spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml

Lines changed: 49 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -44,48 +44,55 @@
4444
<scope>test</scope>
4545
</dependency>
4646
</dependencies>
47-
<build>
48-
<plugins>
49-
<plugin>
50-
<groupId>org.codehaus.mojo</groupId>
51-
<artifactId>build-helper-maven-plugin</artifactId>
52-
<executions>
53-
<execution>
54-
<id>reserve-network-port</id>
55-
<goals>
56-
<goal>reserve-network-port</goal>
57-
</goals>
58-
<phase>process-resources</phase>
47+
<profiles>
48+
<profile>
49+
<activation>
50+
<jdk>1.8</jdk>
51+
</activation>
52+
<build>
53+
<plugins>
54+
<plugin>
55+
<groupId>org.codehaus.mojo</groupId>
56+
<artifactId>build-helper-maven-plugin</artifactId>
57+
<executions>
58+
<execution>
59+
<id>reserve-network-port</id>
60+
<goals>
61+
<goal>reserve-network-port</goal>
62+
</goals>
63+
<phase>process-resources</phase>
64+
<configuration>
65+
<portNames>
66+
<portName>appserver.port</portName>
67+
<portName>appserver.ajp.port</portName>
68+
</portNames>
69+
</configuration>
70+
</execution>
71+
</executions>
72+
</plugin>
73+
<plugin>
74+
<groupId>org.codehaus.cargo</groupId>
75+
<artifactId>cargo-maven2-plugin</artifactId>
5976
<configuration>
60-
<portNames>
61-
<portName>appserver.port</portName>
62-
<portName>appserver.ajp.port</portName>
63-
</portNames>
77+
<configuration>
78+
<properties>
79+
<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
80+
<cargo.tomcat.ajp.port>${appserver.ajp.port}</cargo.tomcat.ajp.port>
81+
</properties>
82+
</configuration>
6483
</configuration>
65-
</execution>
66-
</executions>
67-
</plugin>
68-
<plugin>
69-
<groupId>org.codehaus.cargo</groupId>
70-
<artifactId>cargo-maven2-plugin</artifactId>
71-
<configuration>
72-
<configuration>
73-
<properties>
74-
<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
75-
<cargo.tomcat.ajp.port>${appserver.ajp.port}</cargo.tomcat.ajp.port>
76-
</properties>
77-
</configuration>
78-
</configuration>
79-
</plugin>
80-
<plugin>
81-
<groupId>org.apache.maven.plugins</groupId>
82-
<artifactId>maven-failsafe-plugin</artifactId>
83-
<configuration>
84-
<systemPropertyVariables>
85-
<port>${appserver.port}</port>
86-
</systemPropertyVariables>
87-
</configuration>
88-
</plugin>
89-
</plugins>
90-
</build>
84+
</plugin>
85+
<plugin>
86+
<groupId>org.apache.maven.plugins</groupId>
87+
<artifactId>maven-failsafe-plugin</artifactId>
88+
<configuration>
89+
<systemPropertyVariables>
90+
<port>${appserver.port}</port>
91+
</systemPropertyVariables>
92+
</configuration>
93+
</plugin>
94+
</plugins>
95+
</build>
96+
</profile>
97+
</profiles>
9198
</project>

‎spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml

Lines changed: 49 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -49,48 +49,55 @@
4949
<scope>test</scope>
5050
</dependency>
5151
</dependencies>
52-
<build>
53-
<plugins>
54-
<plugin>
55-
<groupId>org.codehaus.mojo</groupId>
56-
<artifactId>build-helper-maven-plugin</artifactId>
57-
<executions>
58-
<execution>
59-
<id>reserve-network-port</id>
60-
<goals>
61-
<goal>reserve-network-port</goal>
62-
</goals>
63-
<phase>process-resources</phase>
52+
<profiles>
53+
<profile>
54+
<activation>
55+
<jdk>1.8</jdk>
56+
</activation>
57+
<build>
58+
<plugins>
59+
<plugin>
60+
<groupId>org.codehaus.mojo</groupId>
61+
<artifactId>build-helper-maven-plugin</artifactId>
62+
<executions>
63+
<execution>
64+
<id>reserve-network-port</id>
65+
<goals>
66+
<goal>reserve-network-port</goal>
67+
</goals>
68+
<phase>process-resources</phase>
69+
<configuration>
70+
<portNames>
71+
<portName>appserver.port</portName>
72+
<portName>appserver.ajp.port</portName>
73+
</portNames>
74+
</configuration>
75+
</execution>
76+
</executions>
77+
</plugin>
78+
<plugin>
79+
<groupId>org.codehaus.cargo</groupId>
80+
<artifactId>cargo-maven2-plugin</artifactId>
6481
<configuration>
65-
<portNames>
66-
<portName>appserver.port</portName>
67-
<portName>appserver.ajp.port</portName>
68-
</portNames>
82+
<configuration>
83+
<properties>
84+
<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
85+
<cargo.tomcat.ajp.port>${appserver.ajp.port}</cargo.tomcat.ajp.port>
86+
</properties>
87+
</configuration>
6988
</configuration>
70-
</execution>
71-
</executions>
72-
</plugin>
73-
<plugin>
74-
<groupId>org.codehaus.cargo</groupId>
75-
<artifactId>cargo-maven2-plugin</artifactId>
76-
<configuration>
77-
<configuration>
78-
<properties>
79-
<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
80-
<cargo.tomcat.ajp.port>${appserver.ajp.port}</cargo.tomcat.ajp.port>
81-
</properties>
82-
</configuration>
83-
</configuration>
84-
</plugin>
85-
<plugin>
86-
<groupId>org.apache.maven.plugins</groupId>
87-
<artifactId>maven-failsafe-plugin</artifactId>
88-
<configuration>
89-
<systemPropertyVariables>
90-
<port>${appserver.port}</port>
91-
</systemPropertyVariables>
92-
</configuration>
93-
</plugin>
94-
</plugins>
95-
</build>
89+
</plugin>
90+
<plugin>
91+
<groupId>org.apache.maven.plugins</groupId>
92+
<artifactId>maven-failsafe-plugin</artifactId>
93+
<configuration>
94+
<systemPropertyVariables>
95+
<port>${appserver.port}</port>
96+
</systemPropertyVariables>
97+
</configuration>
98+
</plugin>
99+
</plugins>
100+
</build>
101+
</profile>
102+
</profiles>
96103
</project>

0 commit comments

Comments
 (0)