diff options
| -rw-r--r-- | src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/errorprone/ErrorPronePlugin.java | 10 | ||||
| -rw-r--r-- | third_party/BUILD | 12 | ||||
| -rw-r--r-- | third_party/error_prone/error_prone_annotation-2.0.8-20151216.jar | bin | 11760 -> 0 bytes | |||
| -rw-r--r-- | third_party/error_prone/error_prone_annotation-2.0.9-20160129.jar | bin | 0 -> 11280 bytes | |||
| -rw-r--r-- | third_party/error_prone/error_prone_annotations-2.0.9-20160129.jar (renamed from third_party/error_prone/error_prone_annotations-2.0.8-20151216.jar) | bin | 7377 -> 7875 bytes | |||
| -rw-r--r-- | third_party/error_prone/error_prone_core-2.0.9-20160129.jar (renamed from third_party/error_prone/error_prone_core-2.0.8-20151216.jar) | bin | 1377591 -> 1394629 bytes |
6 files changed, 15 insertions, 7 deletions
diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/errorprone/ErrorPronePlugin.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/errorprone/ErrorPronePlugin.java index 3f2d4f6369..feb97f4c75 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/errorprone/ErrorPronePlugin.java +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/errorprone/ErrorPronePlugin.java @@ -22,6 +22,7 @@ import com.google.common.collect.Iterables; import com.google.devtools.build.buildjar.InvalidCommandLineException; import com.google.devtools.build.buildjar.javac.plugins.BlazeJavaCompilerPlugin; import com.google.errorprone.ErrorProneAnalyzer; +import com.google.errorprone.ErrorProneError; import com.google.errorprone.ErrorProneOptions; import com.google.errorprone.InvalidCommandLineOptionException; import com.google.errorprone.bugpatterns.BugChecker; @@ -166,7 +167,14 @@ public final class ErrorPronePlugin extends BlazeJavaCompilerPlugin { @Override public void postFlow(Env<AttrContext> env) { if (enabled) { - errorProneAnalyzer.finished(new TaskEvent(Kind.ANALYZE, env.toplevel, env.enclClass.sym)); + try { + errorProneAnalyzer.finished(new TaskEvent(Kind.ANALYZE, env.toplevel, env.enclClass.sym)); + } catch (ErrorProneError e) { + e.logFatalError(log); + // let the exception propagate to javac's main, where it will cause the compilation to + // terminate with Result.ABNORMAL + throw e; + } } } diff --git a/third_party/BUILD b/third_party/BUILD index 0af3abae16..81b7490708 100644 --- a/third_party/BUILD +++ b/third_party/BUILD @@ -210,9 +210,9 @@ java_import( java_import( name = "error_prone", jars = [ - "error_prone/error_prone_core-2.0.8-20151216.jar", - "error_prone/error_prone_annotations-2.0.8-20151216.jar", - "error_prone/error_prone_annotation-2.0.8-20151216.jar", + "error_prone/error_prone_core-2.0.9-20160129.jar", + "error_prone/error_prone_annotations-2.0.9-20160129.jar", + "error_prone/error_prone_annotation-2.0.9-20160129.jar", ], exports = [ ":checker_framework_dataflow", @@ -257,9 +257,9 @@ filegroup( name = "error_prone-jars", srcs = [ "checker_framework_dataflow/dataflow-1.8.10.jar", - "error_prone/error_prone_annotation-2.0.8-20151216.jar", - "error_prone/error_prone_annotations-2.0.8-20151216.jar", - "error_prone/error_prone_core-2.0.8-20151216.jar", + "error_prone/error_prone_annotation-2.0.9-20160129.jar", + "error_prone/error_prone_annotations-2.0.9-20160129.jar", + "error_prone/error_prone_core-2.0.9-20160129.jar", "guava/guava-19.0.jar", "jcip_annotations/jcip-annotations-1.0-1.jar", "jformatstring/jFormatString-3.0.0.jar", diff --git a/third_party/error_prone/error_prone_annotation-2.0.8-20151216.jar b/third_party/error_prone/error_prone_annotation-2.0.8-20151216.jar Binary files differdeleted file mode 100644 index 26e297517b..0000000000 --- a/third_party/error_prone/error_prone_annotation-2.0.8-20151216.jar +++ /dev/null diff --git a/third_party/error_prone/error_prone_annotation-2.0.9-20160129.jar b/third_party/error_prone/error_prone_annotation-2.0.9-20160129.jar Binary files differnew file mode 100644 index 0000000000..888a146830 --- /dev/null +++ b/third_party/error_prone/error_prone_annotation-2.0.9-20160129.jar diff --git a/third_party/error_prone/error_prone_annotations-2.0.8-20151216.jar b/third_party/error_prone/error_prone_annotations-2.0.9-20160129.jar Binary files differindex 2f685c6971..87015c5a3e 100644 --- a/third_party/error_prone/error_prone_annotations-2.0.8-20151216.jar +++ b/third_party/error_prone/error_prone_annotations-2.0.9-20160129.jar diff --git a/third_party/error_prone/error_prone_core-2.0.8-20151216.jar b/third_party/error_prone/error_prone_core-2.0.9-20160129.jar Binary files differindex 3227f1e139..5ade4fab3d 100644 --- a/third_party/error_prone/error_prone_core-2.0.8-20151216.jar +++ b/third_party/error_prone/error_prone_core-2.0.9-20160129.jar |