Merge branch '2.0.x'

This commit is contained in:
Andy Wilkinson 2018-05-11 10:04:12 +01:00
commit 0d858c1278
1 changed files with 48 additions and 40 deletions

View File

@ -42,6 +42,12 @@
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<profile>
<id>jdk8</id>
<activation>
<jdk>1.8</jdk>
</activation>
<build>
<plugins>
<plugin>
@ -84,4 +90,6 @@
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>