Merge branch 'stable-2.15'

* stable-2.15:
  Harmonize external dependency names

Change-Id: I16df3dd753cdbeeab94d9e86392bc668dc7f1832
diff --git a/BUILD b/BUILD
index f5c232f..a2d6d18 100644
--- a/BUILD
+++ b/BUILD
@@ -1,9 +1,9 @@
 load("//tools/bzl:junit.bzl", "junit_tests")
 load(
     "//tools/bzl:plugin.bzl",
-    "gerrit_plugin",
     "PLUGIN_DEPS",
     "PLUGIN_TEST_DEPS",
+    "gerrit_plugin",
 )
 
 gerrit_plugin(
@@ -20,9 +20,9 @@
     resources = glob(["src/main/resources/**/*"]),
     deps = [
         "//plugins/its-base",
-        "@commons_codec//jar:neverlink",
-        "@commons_io//jar",
-        "@commons_logging//jar",
+        "@commons-codec//jar:neverlink",
+        "@commons-io//jar",
+        "@commons-logging//jar",
     ],
 )
 
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index df3c787..b078f29 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -2,7 +2,7 @@
 
 def external_plugin_deps():
   maven_jar(
-    name = 'commons_logging',
+    name = 'commons-logging',
     artifact = 'commons-logging:commons-logging:1.2',
     sha1 = '4bfc12adfe4842bf07b657f0369c4cb522955686',
   )