Skip to content

Commit 7a27882

Browse files
wilkinsonawilkinsona
committed
Restrict Liberty deployment tests to Java 8
OpenLiberty does not yet support Java 9 or 10 and stopping the server currently hangs when using Java 10. Closes gh-13141
1 parent 6ddf1c2 commit 7a27882

File tree

1 file changed

+48
-40
lines changed
  • spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp

1 file changed

+48
-40
lines changed

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

Lines changed: 48 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -42,46 +42,54 @@
4242
<scope>test</scope>
4343
</dependency>
4444
</dependencies>
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>
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>
5774
<configuration>
58-
<portNames>
59-
<portName>appserver.port</portName>
60-
</portNames>
75+
<configuration>
76+
<properties>
77+
<cargo.servlet.port>${appserver.port}</cargo.servlet.port>
78+
</properties>
79+
</configuration>
6180
</configuration>
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>
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>
8795
</project>

0 commit comments

Comments
 (0)