Description: Upstream_860af5be10b6bad68144d9d2d34173e86b40268c_fix_MissingResourceException_locale_en_US
 .
 bazel (0.6.1-1) unstable; urgency=medium
 .
   * New upstream release.
Author: Adam Cecile <acecile@le-vert.net>

---
Origin: upstream, https://github.com/bazelbuild/bazel/commit/860af5be10b6bad68144d9d2d34173e86b40268c
Bug: https://github.com/bazelbuild/bazel/issues/4483
Forwarded: not-needed
Reviewed-By: Bazel upstream
Last-Update: 2018-03-20

--- bazel-0.6.1.orig/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/errorprone/ErrorPronePlugin.java
+++ bazel-0.6.1/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/errorprone/ErrorPronePlugin.java
@@ -18,6 +18,7 @@ import com.google.common.annotations.Vis
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.buildjar.InvalidCommandLineException;
 import com.google.devtools.build.buildjar.javac.plugins.BlazeJavaCompilerPlugin;
+import com.google.errorprone.BaseErrorProneJavaCompiler;
 import com.google.errorprone.ErrorProneAnalyzer;
 import com.google.errorprone.ErrorProneError;
 import com.google.errorprone.ErrorProneOptions;
@@ -30,7 +31,6 @@ import com.sun.tools.javac.comp.AttrCont
 import com.sun.tools.javac.comp.Env;
 import com.sun.tools.javac.main.JavaCompiler;
 import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.JavacMessages;
 import com.sun.tools.javac.util.Log;
 import java.util.Arrays;
 import java.util.List;
@@ -66,7 +66,7 @@ public final class ErrorPronePlugin exte
 
   /** Registers our message bundle. */
   public static void setupMessageBundle(Context context) {
-    JavacMessages.instance(context).add("com.google.errorprone.errors");
+    BaseErrorProneJavaCompiler.setupMessageBundle(context);
   }
 
   @Override
