Skip to content

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

Merge branch '2.0.x'

parents 360f4e17 7a27882d
Show whitespace changes
Inline Side-by-side
Showing with 48 additions and 40 deletions
spring-boot-tests/spring-boot-deployment-tests/spring-boot-deployment-test-wlp/pom.xml
View file @ 0d858c12
...@@ -42,6 +42,12 @@ ...@@ -42,6 +42,12 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<profiles>
<profile>
<id>jdk8</id>
<activation>
<jdk>1.8</jdk>
</activation>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
...@@ -84,4 +90,6 @@ ...@@ -84,4 +90,6 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile>
</profiles>
</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