root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Andy Wilkinson 2018-05-11 10:04:12 +01:00
parent 360f4e17c2 7a27882d62
commit 0d858c1278
1 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml
View File

@ -42,46 +42,54 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <profiles>
<plugins> <profile>
<plugin> <id>jdk8</id>
<groupId>org.codehaus.mojo</groupId> <activation>
<artifactId>build-helper-maven-plugin</artifactId> <jdk>1.8</jdk>
<executions> </activation>
<execution> <build>
<id>reserve-network-port</id> <plugins>
<goals> <plugin>
<goal>reserve-network-port</goal> <groupId>org.codehaus.mojo</groupId>
</goals> <artifactId>build-helper-maven-plugin</artifactId>
<phase>process-resources</phase> <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> <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>