Skip to content

Commit

Permalink
Fix build with JDK 11
Browse files Browse the repository at this point in the history
Fixes #313

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=218634870
  • Loading branch information
tbroyer authored and ronshapiro committed Oct 29, 2018
1 parent 79b1249 commit 92e0dfc
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 39 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Expand Up @@ -16,7 +16,6 @@ jdk:

matrix:
allow_failures:
- jdk: openjdk11
- jdk: openjdk-ea

# see https://github.com/travis-ci/travis-ci/issues/8408
Expand Down
6 changes: 3 additions & 3 deletions core/pom.xml
Expand Up @@ -87,9 +87,9 @@
<docencoding>UTF-8</docencoding>
<charset>UTF-8</charset>
<links>
<link>http://google.github.io/guava/releases/${guava.version}/api/docs/</link>
<link>http://jsr-305.googlecode.com/svn/trunk/javadoc/</link>
<link>http://docs.oracle.com/javase/7/docs/api/</link>
<link>https://google.github.io/guava/releases/${guava.version}/api/docs/</link>
<link>https://javadoc.io/page/com.google.code.findbugs/jsr305/${jsr305.version}/</link>
<link>https://docs.oracle.com/javase/8/docs/api/</link>
</links>
</configuration>
<executions>
Expand Down
58 changes: 23 additions & 35 deletions pom.xml
Expand Up @@ -98,6 +98,7 @@
<guava.version>22.0</guava.version>
<javac.version>9+181-r4173-1</javac.version>
<truth.version>0.36</truth.version>
<jsr305.version>3.0.2</jsr305.version>
</properties>

<dependencyManagement>
Expand All @@ -118,7 +119,7 @@
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>2.0.1</version>
<version>${jsr305.version}</version>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
Expand Down Expand Up @@ -185,26 +186,18 @@
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<compilerId>javac-with-errorprone</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<compilerArgs>
<arg>-XDcompilePolicy=simple</arg>
<arg>-Xplugin:ErrorProne</arg>
</compilerArgs>
<annotationProcessorPaths>
<path>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
<version>2.3.2</version>
</path>
</annotationProcessorPaths>
</configuration>
<dependencies>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
<version>2.1.3</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-javac</artifactId>
<version>2.8.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-javac-errorprone</artifactId>
<version>2.8.2</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -232,6 +225,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<doclint>none</doclint>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -254,30 +250,22 @@
</build>

<profiles>
<!-- using github.com/google/error-prone-javac is required when running on JDK 8 -->
<profile>
<id>jdk8</id>
<activation>
<jdk>[1.8,)</jdk>
<jdk>1.8</jdk>
</activation>
<!-- Disable doclint under JDK 8 -->
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<doclint>none</doclint>
</configuration>
</plugin>
</plugins>
</reporting>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<doclint>none</doclint>
<fork>true</fork>
<compilerArgs combine.children="append">
<arg>-J-Xbootclasspath/p:${settings.localRepository}/com/google/errorprone/javac/${javac.version}/javac-${javac.version}.jar</arg>
</compilerArgs>
</configuration>
</plugin>
</plugins>
Expand Down

0 comments on commit 92e0dfc

Please sign in to comment.