Skip to content

Commit aa27334

Browse files
wilkinsonawilkinsona
committed
Run deployment tests on JDK 9 and 10 where possible
Closes gh-10414
1 parent e44bfbe commit aa27334

File tree

5 files changed

+135
-157
lines changed

5 files changed

+135
-157
lines changed

‎spring-boot-project/spring-boot-parent/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@
343343
<plugin>
344344
<groupId>org.codehaus.cargo</groupId>
345345
<artifactId>cargo-maven2-plugin</artifactId>
346-
<version>1.6.4</version>
346+
<version>1.6.7</version>
347347
</plugin>
348348
<plugin>
349349
<groupId>org.codehaus.gmavenplus</groupId>

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

+42-50
Original file line numberDiff line numberDiff line change
@@ -43,56 +43,48 @@
4343
<scope>test</scope>
4444
</dependency>
4545
</dependencies>
46-
<profiles>
47-
<profile>
48-
<id>jdk8</id>
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>
46+
<build>
47+
<plugins>
48+
<plugin>
49+
<groupId>org.codehaus.mojo</groupId>
50+
<artifactId>build-helper-maven-plugin</artifactId>
51+
<executions>
52+
<execution>
53+
<id>reserve-network-port</id>
54+
<goals>
55+
<goal>reserve-network-port</goal>
56+
</goals>
57+
<phase>process-resources</phase>
7658
<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>
59+
<portNames>
60+
<portName>appserver.port</portName>
61+
<portName>appserver.ajp.port</portName>
62+
</portNames>
8363
</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>
96-
</profile>
97-
</profiles>
64+
</execution>
65+
</executions>
66+
</plugin>
67+
<plugin>
68+
<groupId>org.codehaus.cargo</groupId>
69+
<artifactId>cargo-maven2-plugin</artifactId>
70+
<configuration>
71+
<configuration>
72+
<properties>
73+
<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
74+
<cargo.tomcat.ajp.port>${appserver.ajp.port}</cargo.tomcat.ajp.port>
75+
</properties>
76+
</configuration>
77+
</configuration>
78+
</plugin>
79+
<plugin>
80+
<groupId>org.apache.maven.plugins</groupId>
81+
<artifactId>maven-failsafe-plugin</artifactId>
82+
<configuration>
83+
<systemPropertyVariables>
84+
<port>${appserver.port}</port>
85+
</systemPropertyVariables>
86+
</configuration>
87+
</plugin>
88+
</plugins>
89+
</build>
9890
</project>

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

+49-57
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<description>Spring Boot WildFly Deployment Test</description>
1313
<properties>
1414
<main.basedir>${basedir}/../../..</main.basedir>
15-
<wildfly.version>9.0.2.Final</wildfly.version>
16-
<cargo.container.id>wildfly9x</cargo.container.id>
15+
<wildfly.version>12.0.0.Final</wildfly.version>
16+
<cargo.container.id>wildfly12x</cargo.container.id>
1717
<cargo.container.url>http://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip
1818
</cargo.container.url>
1919
</properties>
@@ -43,61 +43,53 @@
4343
<scope>test</scope>
4444
</dependency>
4545
</dependencies>
46-
<profiles>
47-
<profile>
48-
<id>jdk8</id>
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-
<portName>appserver.transaction.port</portName>
69-
</portNames>
70-
</configuration>
71-
</execution>
72-
</executions>
73-
</plugin>
74-
<plugin>
75-
<groupId>org.codehaus.cargo</groupId>
76-
<artifactId>cargo-maven2-plugin</artifactId>
46+
<build>
47+
<plugins>
48+
<plugin>
49+
<groupId>org.codehaus.mojo</groupId>
50+
<artifactId>build-helper-maven-plugin</artifactId>
51+
<executions>
52+
<execution>
53+
<id>reserve-network-port</id>
54+
<goals>
55+
<goal>reserve-network-port</goal>
56+
</goals>
57+
<phase>process-resources</phase>
7758
<configuration>
78-
<configuration>
79-
<properties>
80-
<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
81-
<cargo.jboss.ajp.port>${appserver.ajp.port}</cargo.jboss.ajp.port>
82-
<cargo.jboss.transaction.statusManager.port>
83-
${appserver.transaction.port}
84-
</cargo.jboss.transaction.statusManager.port>
85-
<cargo.jboss.configuration>standalone-full</cargo.jboss.configuration>
86-
</properties>
87-
</configuration>
59+
<portNames>
60+
<portName>appserver.port</portName>
61+
<portName>appserver.ajp.port</portName>
62+
<portName>appserver.transaction.port</portName>
63+
</portNames>
8864
</configuration>
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>
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.jboss.ajp.port>${appserver.ajp.port}</cargo.jboss.ajp.port>
76+
<cargo.jboss.transaction.statusManager.port>
77+
${appserver.transaction.port}
78+
</cargo.jboss.transaction.statusManager.port>
79+
<cargo.jboss.configuration>standalone-full</cargo.jboss.configuration>
80+
</properties>
81+
</configuration>
82+
</configuration>
83+
</plugin>
84+
<plugin>
85+
<groupId>org.apache.maven.plugins</groupId>
86+
<artifactId>maven-failsafe-plugin</artifactId>
87+
<configuration>
88+
<systemPropertyVariables>
89+
<port>${appserver.port}</port>
90+
</systemPropertyVariables>
91+
</configuration>
92+
</plugin>
93+
</plugins>
94+
</build>
10395
</project>

‎spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/main/webapp/WEB-INF/jboss-deployment-structure.xml

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<module name="com.fasterxml.jackson.core.jackson-annotations" />
66
<module name="com.fasterxml.jackson.core.jackson-core" />
77
<module name="com.fasterxml.jackson.core.jackson-databind" />
8+
<module name="com.fasterxml.jackson.datatype.jackson-datatype-jdk8"/>
9+
<module name="com.fasterxml.jackson.datatype.jackson-datatype-jsr310"/>
810
<module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" />
911
<module name="org.jboss.resteasy.resteasy-jackson2-provider" />
1012
<module name="org.slf4j" />

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

+41-49
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<description>Spring Boot WebSphere Liberty Profile Deployment Test</description>
1313
<properties>
1414
<main.basedir>${basedir}/../../..</main.basedir>
15-
<wlp.version>16.0.0.4</wlp.version>
15+
<wlp.version>18.0.0.1</wlp.version>
1616
<cargo.container.id>liberty</cargo.container.id>
1717
<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>
1818
</properties>
@@ -42,54 +42,46 @@
4242
<scope>test</scope>
4343
</dependency>
4444
</dependencies>
45-
<profiles>
46-
<profile>
47-
<id>jdk8</id>
48-
<activation>
49-
<jdk>1.8</jdk>
50-
</activation>
51-
<build>
52-
<plugins>
53-
<plugin>
54-
<groupId>org.codehaus.mojo</groupId>
55-
<artifactId>build-helper-maven-plugin</artifactId>
56-
<executions>
57-
<execution>
58-
<id>reserve-network-port</id>
59-
<goals>
60-
<goal>reserve-network-port</goal>
61-
</goals>
62-
<phase>process-resources</phase>
63-
<configuration>
64-
<portNames>
65-
<portName>appserver.port</portName>
66-
</portNames>
67-
</configuration>
68-
</execution>
69-
</executions>
70-
</plugin>
71-
<plugin>
72-
<groupId>org.codehaus.cargo</groupId>
73-
<artifactId>cargo-maven2-plugin</artifactId>
45+
<build>
46+
<plugins>
47+
<plugin>
48+
<groupId>org.codehaus.mojo</groupId>
49+
<artifactId>build-helper-maven-plugin</artifactId>
50+
<executions>
51+
<execution>
52+
<id>reserve-network-port</id>
53+
<goals>
54+
<goal>reserve-network-port</goal>
55+
</goals>
56+
<phase>process-resources</phase>
7457
<configuration>
75-
<configuration>
76-
<properties>
77-
<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
78-
</properties>
79-
</configuration>
58+
<portNames>
59+
<portName>appserver.port</portName>
60+
</portNames>
8061
</configuration>
81-
</plugin>
82-
<plugin>
83-
<groupId>org.apache.maven.plugins</groupId>
84-
<artifactId>maven-failsafe-plugin</artifactId>
85-
<configuration>
86-
<systemPropertyVariables>
87-
<port>${appserver.port}</port>
88-
</systemPropertyVariables>
89-
</configuration>
90-
</plugin>
91-
</plugins>
92-
</build>
93-
</profile>
94-
</profiles>
62+
</execution>
63+
</executions>
64+
</plugin>
65+
<plugin>
66+
<groupId>org.codehaus.cargo</groupId>
67+
<artifactId>cargo-maven2-plugin</artifactId>
68+
<configuration>
69+
<configuration>
70+
<properties>
71+
<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
72+
</properties>
73+
</configuration>
74+
</configuration>
75+
</plugin>
76+
<plugin>
77+
<groupId>org.apache.maven.plugins</groupId>
78+
<artifactId>maven-failsafe-plugin</artifactId>
79+
<configuration>
80+
<systemPropertyVariables>
81+
<port>${appserver.port}</port>
82+
</systemPropertyVariables>
83+
</configuration>
84+
</plugin>
85+
</plugins>
86+
</build>
9587
</project>

0 commit comments

Comments
 (0)