Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,17 @@
</distributionManagement>

<profiles>
<!--
This profile is needed to be active in IntelliJ
as it does not understand that the tests have a different target version
-->
<profile>
<id>java9</id>
<id>IntelliJ</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<properties>
<maven.compiler.target>9</maven.compiler.target>
<maven.compiler.target>10</maven.compiler.target>
</properties>
</profile>
<profile>
Expand Down Expand Up @@ -115,9 +119,7 @@
<profile>
<id>errorprone</id>
<activation>
<property>
<name>maven.compiler.errorprone</name>
</property>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
Expand Down Expand Up @@ -223,6 +225,18 @@
</goals>
</execution>
</executions>
<dependencies>
<!--
The transitive dependency has version 3.5,
which is not compatible with Java 10.
TODO Remove this when updating the javadoc plugin version.
-->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.7</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -236,6 +250,7 @@
</execution>
</executions>
</plugin>
<!-- Check that we don't accidentally use features only available in Java 8+ -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
Expand All @@ -261,7 +276,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.3.1</version>
<version>3.0.0-M1</version>
<executions>
<execution>
<id>enforce-java</id>
Expand Down Expand Up @@ -303,7 +318,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.0</version>
<version>0.8.1</version>
<executions>
<execution>
<goals>
Expand Down