Skip to content

Commit

Permalink
WIP.
Browse files Browse the repository at this point in the history 
This is a mess. Half of these changes aren't necessary.  And this breaks due to
a JDK 9 internal API change. See also
typetools/checker-framework#1224
  • Loading branch information
@Stephan202
Stephan202 committed Apr 28, 2018
1 parent 35d2f1c commit 609e84e
Show file tree
Hide file tree
Showing 2 changed files with 92 additions and 0 deletions.
25 changes: 25 additions & 0 deletions error-prone-contrib/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,30 @@
<artifactId>spring-web</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-compat-qual</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker</artifactId>
<scope>provided</scope>
</dependency>
<!--<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>compiler</artifactId>
<scope>provided</scope>
</dependency>-->
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>jdk8</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
67 changes: 67 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.checker-framework>2.5.0</version.checker-framework>
<version.checkstyle>8.9</version.checkstyle>
<version.error-prone>2.3.1</version.error-prone>
<version.extra-enforcer-rules>1.0-beta-7</version.extra-enforcer-rules>
Expand Down Expand Up @@ -224,6 +225,31 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-compat-qual</artifactId>
<version>${version.checker-framework}</version>
</dependency>
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<version>${version.checker-framework}</version>
</dependency>
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker</artifactId>
<version>${version.checker-framework}</version>
</dependency>
<!--<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>compiler</artifactId>
<version>${version.checker-framework}</version>
</dependency>-->
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>jdk8</artifactId>
<version>${version.checker-framework}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -814,7 +840,41 @@
<artifactId>nullaway</artifactId>
<version>${version.nullaway}</version>
</path>
<path>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<version>${version.checker-framework}</version>
</path>
<!--<path>
<groupId>org.checkerframework</groupId>
<artifactId>checker-compat-qual</artifactId>
<version>${version.checker-framework}</version>
</path>-->
<path>
<groupId>org.checkerframework</groupId>
<artifactId>checker</artifactId>
<version>${version.checker-framework}</version>
</path>
<!--<path>
<groupId>org.checkerframework</groupId>
<artifactId>compiler</artifactId>
<version>${version.checker-framework}</version>
</path>-->
<!-- EP depends on incompatible version 2.1.14. -->
<!--<path>
<groupId>org.checkerframework</groupId>
<artifactId>javacutil</artifactId>
<version>${version.checker-framework}</version>
</path>-->
<path>
<groupId>org.checkerframework</groupId>
<artifactId>jdk8</artifactId>
<version>${version.checker-framework}</version>
</path>
</annotationProcessorPaths>
<annotationProcessors>
<annotationProcessor>org.checkerframework.checker.nullness.NullnessChecker</annotationProcessor>
</annotationProcessors>
<compilerArgs combine.children="append">
<!-- We enable nearly all doclint checks,
except that we don't care about missing Javadoc
Expand All @@ -829,6 +889,7 @@
should review whether this issue has been
resolved. -->
<arg>-Xlint:-processing</arg>
<arg>-AprintErrorStack</arg>
<!-- We want to enable almost all error-prone
bug pattern checkers, so we enable all and then
selectively deactivate some. -->
Expand Down Expand Up @@ -866,6 +927,12 @@
<artifactId>plexus-compiler-javac-errorprone</artifactId>
<version>${version.plexus-compiler}</version>
</dependency>
<!-- Fix in EP -->
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<version>${version.checker-framework}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
Expand Down

0 comments on commit 609e84e

Please sign in to comment.