Merge pull request #28 from pubref/improve_conflict_message

Improve conflict error message and update findbugs dep

Author: pcj

WORKSPACE

@@ -48,7 +48,7 @@ csharp_repositories(use_local_mono = False)
 
 git_repository(
     name = "org_pubref_rules_node",
-    commit = "d93a80ac4920c52da8adccbca66a3118a27018fd",  # Oct 2, 2016
+    commit = "85b720f3d4299b0a1b9c7771c023352e9182045f",  # Oct 10, 2016
     remote = "https://github.com/pubref/rules_node.git",
 )
 
@@ -154,6 +154,6 @@ go_proto_library(
 new_git_repository(
     name = "com_github_googleapis_googleapis",
     build_file_content = GOOGLEAPIS_BUILD_FILE,
-    commit = "60c2f9c8d012db35a65539e30fb6364c36f2e96b",
+    commit = "13ac2436c5e3d568bd0e938f6ed58b77a48aba15",
     remote = "https://github.com/googleapis/googleapis.git",
 )

java/deps.bzl

@@ -20,8 +20,8 @@ DEPS = {
 
     "com_google_code_findbugs_jsr305": {
         "rule": "maven_jar",
-        "artifact": "com.google.code.findbugs:jsr305:jar:3.0.0",
-        "sha1": "5871fb60dc68d67da54a663c3fd636a10a532948",
+        "artifact": "com.google.code.findbugs:jsr305:jar:3.0.1",
+        "sha1": "f7be08ec23c21485b9b5a1cf1654c2ec8c58168d",
     },
 
     "com_google_guava_guava": {

protobuf/internal/require.bzl

@@ -13,10 +13,12 @@ def _needs_install(name, dep, hkeys=["sha256", "sha1", "tag"], verbose=0):
         actual = existing_rule.get(hkey)
         if expected:
             if expected != actual:
-                fail("Workspace %s exists but %s=%s did not match " +
-                     "the required value (%s).  Either remove it from " +
-                     "your WORKSPACE or exclude it from loading."
-                     % (name, hkey, actual, expected))
+                msg = """
+An existing {0} rule '{1}' was already loaded with a {2} value of '{3}'.  Refusing to overwrite this with the requested value ('{4}').
+Either remove the pre-existing rule from your WORKSPACE or exclude it from loading by rules_protobuf.
+""".format(existing_rule["kind"], name, hkey, actual, expected)
+
+                fail(msg)
             else:
                 if verbose > 1: print("Skip reload %s: %s = %s" % (name, hkey, actual))
                 return False