Skip to content

S
spring-boot
Commit aa273346 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Run deployment tests on JDK 9 and 10 where possible 

Closes gh-10414
parent e44bfbea
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 157 deletions
spring-boot-project/spring-boot-parent/pom.xml
View file @ aa273346
...@@ -343,7 +343,7 @@ ...@@ -343,7 +343,7 @@
<plugin> <plugin>
<groupId>org.codehaus.cargo</groupId> <groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId> <artifactId>cargo-maven2-plugin</artifactId>
<version>1.6.4</version> <version>1.6.7</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.gmavenplus</groupId> <groupId>org.codehaus.gmavenplus</groupId>
......
spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml
View file @ aa273346
...@@ -43,56 +43,48 @@ ...@@ -43,56 +43,48 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<profiles> <build>
<profile> <plugins>
<id>jdk8</id> <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>
<configuration> <portNames>
<properties> <portName>appserver.port</portName>
<cargo.servlet.port>${appserver.port}</cargo.servlet.port> <portName>appserver.ajp.port</portName>
<cargo.tomcat.ajp.port>${appserver.ajp.port}</cargo.tomcat.ajp.port> </portNames>
</properties>
</configuration>
</configuration> </configuration>
</plugin> </execution>
<plugin> </executions>
<groupId>org.apache.maven.plugins</groupId> </plugin>
<artifactId>maven-failsafe-plugin</artifactId> <plugin>
<configuration> <groupId>org.codehaus.cargo</groupId>
<systemPropertyVariables> <artifactId>cargo-maven2-plugin</artifactId>
<port>${appserver.port}</port> <configuration>
</systemPropertyVariables> <configuration>
</configuration> <properties>
</plugin> <cargo.servlet.port>${appserver.port}</cargo.servlet.port>
</plugins> <cargo.tomcat.ajp.port>${appserver.ajp.port}</cargo.tomcat.ajp.port>
</build> </properties>
</profile> </configuration>
</profiles> </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>
spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml
View file @ aa273346
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<description>Spring Boot WildFly Deployment Test</description> <description>Spring Boot WildFly Deployment Test</description>
<properties> <properties>
<main.basedir>${basedir}/../../..</main.basedir> <main.basedir>${basedir}/../../..</main.basedir>
<wildfly.version>9.0.2.Final</wildfly.version> <wildfly.version>12.0.0.Final</wildfly.version>
<cargo.container.id>wildfly9x</cargo.container.id> <cargo.container.id>wildfly12x</cargo.container.id>
<cargo.container.url>http://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip <cargo.container.url>http://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip
</cargo.container.url> </cargo.container.url>
</properties> </properties>
...@@ -43,61 +43,53 @@ ...@@ -43,61 +43,53 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<profiles> <build>
<profile> <plugins>
<id>jdk8</id> <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>
<configuration> <portNames>
<properties> <portName>appserver.port</portName>
<cargo.servlet.port>${appserver.port}</cargo.servlet.port> <portName>appserver.ajp.port</portName>
<cargo.jboss.ajp.port>${appserver.ajp.port}</cargo.jboss.ajp.port> <portName>appserver.transaction.port</portName>
<cargo.jboss.transaction.statusManager.port> </portNames>
${appserver.transaction.port}
</cargo.jboss.transaction.statusManager.port>
<cargo.jboss.configuration>standalone-full</cargo.jboss.configuration>
</properties>
</configuration>
</configuration> </configuration>
</plugin> </execution>
<plugin> </executions>
<groupId>org.apache.maven.plugins</groupId> </plugin>
<artifactId>maven-failsafe-plugin</artifactId> <plugin>
<configuration> <groupId>org.codehaus.cargo</groupId>
<systemPropertyVariables> <artifactId>cargo-maven2-plugin</artifactId>
<port>${appserver.port}</port> <configuration>
</systemPropertyVariables> <configuration>
</configuration> <properties>
</plugin> <cargo.servlet.port>${appserver.port}</cargo.servlet.port>
</plugins> <cargo.jboss.ajp.port>${appserver.ajp.port}</cargo.jboss.ajp.port>
</build> <cargo.jboss.transaction.statusManager.port>
</profile> ${appserver.transaction.port}
</profiles> </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> </project>
spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
View file @ aa273346
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
<module name="com.fasterxml.jackson.core.jackson-annotations" /> <module name="com.fasterxml.jackson.core.jackson-annotations" />
<module name="com.fasterxml.jackson.core.jackson-core" /> <module name="com.fasterxml.jackson.core.jackson-core" />
<module name="com.fasterxml.jackson.core.jackson-databind" /> <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="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" />
<module name="org.jboss.resteasy.resteasy-jackson2-provider" /> <module name="org.jboss.resteasy.resteasy-jackson2-provider" />
<module name="org.slf4j" /> <module name="org.slf4j" />
......
spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml
View file @ aa273346
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<description>Spring Boot WebSphere Liberty Profile Deployment Test</description> <description>Spring Boot WebSphere Liberty Profile Deployment Test</description>
<properties> <properties>
<main.basedir>${basedir}/../../..</main.basedir> <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.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> <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> </properties>
...@@ -42,54 +42,46 @@ ...@@ -42,54 +42,46 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<profiles> <build>
<profile> <plugins>
<id>jdk8</id> <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>
<configuration> <portNames>
<properties> <portName>appserver.port</portName>
<cargo.servlet.port>${appserver.port}</cargo.servlet.port> </portNames>
</properties>
</configuration>
</configuration> </configuration>
</plugin> </execution>
<plugin> </executions>
<groupId>org.apache.maven.plugins</groupId> </plugin>
<artifactId>maven-failsafe-plugin</artifactId> <plugin>
<configuration> <groupId>org.codehaus.cargo</groupId>
<systemPropertyVariables> <artifactId>cargo-maven2-plugin</artifactId>
<port>${appserver.port}</port> <configuration>
</systemPropertyVariables> <configuration>
</configuration> <properties>
</plugin> <cargo.servlet.port>${appserver.port}</cargo.servlet.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>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment