Merge "Bazel: Harmonize names of external repositories"

2018-06-13 06:46:12 +00:00 · 2018-06-13 06:46:12 +00:00 · c56eecab90
commit c56eecab90
parent c7abd0d37c e1359a35e1
39 changed files with 199 additions and 199 deletions
--- a/148
+++ b/148
@ -46,7 +46,7 @@ closure_repositories(
 ANTLR_VERS = "3.5.2"

 maven_jar(
-    name = "java_runtime",
+    name = "java-runtime",
    artifact = "org.antlr:antlr-runtime:" + ANTLR_VERS,
    sha1 = "cd9cd41361c155f3af0f653009dcecb08d8b4afd",
 )
@ -58,7 +58,7 @@ maven_jar(
 )

 maven_jar(
-    name = "org_antlr",
+    name = "org-antlr",
    artifact = "org.antlr:antlr:" + ANTLR_VERS,
    sha1 = "c4a65c950bfc3e7d04309c515b2177c00baf7764",
 )
@ -73,19 +73,19 @@ maven_jar(
 GUICE_VERS = "4.2.0"

 maven_jar(
-    name = "guice_library",
+    name = "guice-library",
    artifact = "com.google.inject:guice:" + GUICE_VERS,
    sha1 = "25e1f4c1d528a1cffabcca0d432f634f3132f6c8",
 )

 maven_jar(
-    name = "guice_assistedinject",
+    name = "guice-assistedinject",
    artifact = "com.google.inject.extensions:guice-assistedinject:" + GUICE_VERS,
    sha1 = "e7270305960ad7db56f7e30cb9df6be9ff1cfb45",
 )

 maven_jar(
-    name = "guice_servlet",
+    name = "guice-servlet",
    artifact = "com.google.inject.extensions:guice-servlet:" + GUICE_VERS,
    sha1 = "f57581625c36c148f088d9f52a568d5bdf12c61d",
 )
@ -103,7 +103,7 @@ maven_jar(
 )

 maven_jar(
-    name = "servlet_api_3_1",
+    name = "servlet-api-3_1",
    artifact = "org.apache.tomcat:tomcat-servlet-api:8.5.23",
    sha1 = "021a212688ec94fe77aff74ab34cc74f6f940e60",
 )
@ -123,14 +123,14 @@ maven_jar(
 )

 maven_jar(
-    name = "javax_validation",
+    name = "javax-validation",
    artifact = "javax.validation:validation-api:1.0.0.GA",
    sha1 = "b6bd7f9d78f6fdaa3c37dae18a4bd298915f328e",
    src_sha1 = "7a561191db2203550fbfa40d534d4997624cd369",
 )

 maven_jar(
-    name = "jsinterop_annotations",
+    name = "jsinterop-annotations",
    artifact = "com.google.jsinterop:jsinterop-annotations:1.0.2",
    sha1 = "abd7319f53d018e11108a88f599bd16492448dd2",
    src_sha1 = "33716f8aef043f2f02b78ab4a1acda6cd90a7602",
@ -158,7 +158,7 @@ maven_jar(
 )

 maven_jar(
-    name = "w3c_css_sac",
+    name = "w3c-css-sac",
    artifact = "org.w3c.css:sac:1.3",
    sha1 = "cdb2dcb4e22b83d6b32b93095f644c3462739e82",
 )
@ -208,7 +208,7 @@ maven_jar(
 )

 maven_jar(
-    name = "gwtorm_client",
+    name = "gwtorm-client",
    artifact = "com.google.gerrit:gwtorm:1.18",
    sha1 = "f326dec463439a92ccb32f05b38345e21d0b5ecf",
    src_sha1 = "e0b973d5cafef3d145fa80cdf032fcead1186d29",
@ -249,25 +249,25 @@ maven_jar(
 SLF4J_VERS = "1.7.7"

 maven_jar(
-    name = "log_api",
+    name = "log-api",
    artifact = "org.slf4j:slf4j-api:" + SLF4J_VERS,
    sha1 = "2b8019b6249bb05d81d3a3094e468753e2b21311",
 )

 maven_jar(
-    name = "log_ext",
+    name = "log-ext",
    artifact = "org.slf4j:slf4j-ext:" + SLF4J_VERS,
    sha1 = "09a8f58c784c37525d2624062414358acf296717",
 )

 maven_jar(
-    name = "impl_log4j",
+    name = "impl-log4j",
    artifact = "org.slf4j:slf4j-log4j12:" + SLF4J_VERS,
    sha1 = "58f588119ffd1702c77ccab6acb54bfb41bed8bd",
 )

 maven_jar(
-    name = "jcl_over_slf4j",
+    name = "jcl-over-slf4j",
    artifact = "org.slf4j:jcl-over-slf4j:" + SLF4J_VERS,
    sha1 = "56003dcd0a31deea6391b9e2ef2f2dc90b205a92",
 )
@ -279,13 +279,13 @@ maven_jar(
 )

 maven_jar(
-    name = "jsonevent_layout",
+    name = "jsonevent-layout",
    artifact = "net.logstash.log4j:jsonevent-layout:1.7",
    sha1 = "507713504f0ddb75ba512f62763519c43cf46fde",
 )

 maven_jar(
-    name = "json_smart",
+    name = "json-smart",
    artifact = "net.minidev:json-smart:1.1.1",
    sha1 = "24a2f903d25e004de30ac602c5b47f2d4e420a59",
 )
@ -297,50 +297,50 @@ maven_jar(
 )

 maven_jar(
-    name = "commons_codec",
+    name = "commons-codec",
    artifact = "commons-codec:commons-codec:1.10",
    sha1 = "4b95f4897fa13f2cd904aee711aeafc0c5295cd8",
 )

 # When upgrading commons-compress, also upgrade tukaani-xz
 maven_jar(
-    name = "commons_compress",
+    name = "commons-compress",
    artifact = "org.apache.commons:commons-compress:1.15",
    sha1 = "b686cd04abaef1ea7bc5e143c080563668eec17e",
 )

 maven_jar(
-    name = "commons_lang",
+    name = "commons-lang",
    artifact = "commons-lang:commons-lang:2.6",
    sha1 = "0ce1edb914c94ebc388f086c6827e8bdeec71ac2",
 )

 maven_jar(
-    name = "commons_lang3",
+    name = "commons-lang3",
    artifact = "org.apache.commons:commons-lang3:3.6",
    sha1 = "9d28a6b23650e8a7e9063c04588ace6cf7012c17",
 )

 maven_jar(
-    name = "commons_dbcp",
+    name = "commons-dbcp",
    artifact = "commons-dbcp:commons-dbcp:1.4",
    sha1 = "30be73c965cc990b153a100aaaaafcf239f82d39",
 )

 maven_jar(
-    name = "commons_pool",
+    name = "commons-pool",
    artifact = "commons-pool:commons-pool:1.5.5",
    sha1 = "7d8ffbdc47aa0c5a8afe5dc2aaf512f369f1d19b",
 )

 maven_jar(
-    name = "commons_net",
+    name = "commons-net",
    artifact = "commons-net:commons-net:3.6",
    sha1 = "b71de00508dcb078d2b24b5fa7e538636de9b3da",
 )

 maven_jar(
-    name = "commons_validator",
+    name = "commons-validator",
    artifact = "commons-validator:commons-validator:1.6",
    sha1 = "e989d1e87cdd60575df0765ed5bac65c905d7908",
 )
@ -388,13 +388,13 @@ maven_jar(
 MIME4J_VERS = "0.8.1"

 maven_jar(
-    name = "mime4j_core",
+    name = "mime4j-core",
    artifact = "org.apache.james:apache-mime4j-core:" + MIME4J_VERS,
    sha1 = "c62dfe18a3b827a2c626ade0ffba44562ddf3f61",
 )

 maven_jar(
-    name = "mime4j_dom",
+    name = "mime4j-dom",
    artifact = "org.apache.james:apache-mime4j-dom:" + MIME4J_VERS,
    sha1 = "f2d653c617004193f3350330d907f77b60c88c56",
 )
@ -408,31 +408,31 @@ maven_jar(
 OW2_VERS = "6.0"

 maven_jar(
-    name = "ow2_asm",
+    name = "ow2-asm",
    artifact = "org.ow2.asm:asm:" + OW2_VERS,
    sha1 = "bc6fa6b19424bb9592fe43bbc20178f92d403105",
 )

 maven_jar(
-    name = "ow2_asm_analysis",
+    name = "ow2-asm-analysis",
    artifact = "org.ow2.asm:asm-analysis:" + OW2_VERS,
    sha1 = "dd1cc1381a970800268160203aae2d3784da779b",
 )

 maven_jar(
-    name = "ow2_asm_commons",
+    name = "ow2-asm-commons",
    artifact = "org.ow2.asm:asm-commons:" + OW2_VERS,
    sha1 = "f256fd215d8dd5a4fa2ab3201bf653de266ed4ec",
 )

 maven_jar(
-    name = "ow2_asm_tree",
+    name = "ow2-asm-tree",
    artifact = "org.ow2.asm:asm-tree:" + OW2_VERS,
    sha1 = "a624f1a6e4e428dcd680a01bab2d4c56b35b18f0",
 )

 maven_jar(
-    name = "ow2_asm_util",
+    name = "ow2-asm-util",
    artifact = "org.ow2.asm:asm-util:" + OW2_VERS,
    sha1 = "430b2fc839b5de1f3643b528853d5cf26096c1de",
 )
@ -440,20 +440,20 @@ maven_jar(
 AUTO_VALUE_VERSION = "1.6"

 maven_jar(
-    name = "auto_value",
+    name = "auto-value",
    artifact = "com.google.auto.value:auto-value:" + AUTO_VALUE_VERSION,
    sha1 = "a3b1b1404f8acaa88594a017185e013cd342c9a8",
 )

 maven_jar(
-    name = "auto_value_annotations",
+    name = "auto-value-annotations",
    artifact = "com.google.auto.value:auto-value-annotations:" + AUTO_VALUE_VERSION,
    sha1 = "da725083ee79fdcd86d9f3d8a76e38174a01892a",
 )

 # Transitive dependency of commons-compress
 maven_jar(
-    name = "tukaani_xz",
+    name = "tukaani-xz",
    artifact = "org.tukaani:xz:1.6",
    sha1 = "05b6f921f1810bdf90e25471968f741f87168b64",
 )
@ -461,37 +461,37 @@ maven_jar(
 LUCENE_VERS = "5.5.4"

 maven_jar(
-    name = "lucene_core",
+    name = "lucene-core",
    artifact = "org.apache.lucene:lucene-core:" + LUCENE_VERS,
    sha1 = "ab9c77e75cf142aa6e284b310c8395617bd9b19b",
 )

 maven_jar(
-    name = "lucene_analyzers_common",
+    name = "lucene-analyzers-common",
    artifact = "org.apache.lucene:lucene-analyzers-common:" + LUCENE_VERS,
    sha1 = "08ce9d34c8124c80e176e8332ee947480bbb9576",
 )

 maven_jar(
-    name = "backward_codecs",
+    name = "backward-codecs",
    artifact = "org.apache.lucene:lucene-backward-codecs:" + LUCENE_VERS,
    sha1 = "a933f42e758c54c43083398127ea7342b54d8212",
 )

 maven_jar(
-    name = "lucene_misc",
+    name = "lucene-misc",
    artifact = "org.apache.lucene:lucene-misc:" + LUCENE_VERS,
    sha1 = "a74388857f73614e528ae44d742c60187cb55a5a",
 )

 maven_jar(
-    name = "lucene_queryparser",
+    name = "lucene-queryparser",
    artifact = "org.apache.lucene:lucene-queryparser:" + LUCENE_VERS,
    sha1 = "8a06fad4675473d98d93b61fea529e3f464bf69e",
 )

 maven_jar(
-    name = "mime_util",
+    name = "mime-util",
    artifact = "eu.medsea.mimeutil:mime-util:2.1.3",
    attach_source = False,
    sha1 = "0c9cfae15c74f62491d4f28def0dff1dabe52a47",
@ -502,7 +502,7 @@ PROLOG_VERS = "1.4.3"
 PROLOG_REPO = GERRIT

 maven_jar(
-    name = "prolog_runtime",
+    name = "prolog-runtime",
    artifact = "com.googlecode.prolog-cafe:prolog-runtime:" + PROLOG_VERS,
    attach_source = False,
    repository = PROLOG_REPO,
@ -510,7 +510,7 @@ maven_jar(
 )

 maven_jar(
-    name = "prolog_compiler",
+    name = "prolog-compiler",
    artifact = "com.googlecode.prolog-cafe:prolog-compiler:" + PROLOG_VERS,
    attach_source = False,
    repository = PROLOG_REPO,
@ -518,7 +518,7 @@ maven_jar(
 )

 maven_jar(
-    name = "prolog_io",
+    name = "prolog-io",
    artifact = "com.googlecode.prolog-cafe:prolog-io:" + PROLOG_VERS,
    attach_source = False,
    repository = PROLOG_REPO,
@ -534,7 +534,7 @@ maven_jar(
 )

 maven_jar(
-    name = "guava_retrying",
+    name = "guava-retrying",
    artifact = "com.github.rholder:guava-retrying:2.0.0",
    sha1 = "974bc0a04a11cc4806f7c20a34703bd23c34e7f4",
 )
@ -546,7 +546,7 @@ maven_jar(
 )

 maven_jar(
-    name = "blame_cache",
+    name = "blame-cache",
    artifact = "com/google/gitiles:blame-cache:0.2-6",
    attach_source = False,
    repository = GERRIT,
@ -561,7 +561,7 @@ maven_jar(
 )

 maven_jar(
-    name = "html_types",
+    name = "html-types",
    artifact = "com.google.common.html.types:types:1.0.4",
    sha1 = "2adf4c8bfccc0ff7346f9186ac5aa57d829ad065",
 )
@ -573,7 +573,7 @@ maven_jar(
 )

 maven_jar(
-    name = "dropwizard_core",
+    name = "dropwizard-core",
    artifact = "io.dropwizard.metrics:metrics-core:4.0.2",
    sha1 = "ec9878842d510cabd6bd6a9da1bebae1ae0cd199",
 )
@ -615,7 +615,7 @@ maven_jar(
 )

 maven_jar(
-    name = "mina_core",
+    name = "mina-core",
    artifact = "org.apache.mina:mina-core:2.0.16",
    sha1 = "f720f17643eaa7b0fec07c1d7f6272972c02bba4",
 )
@ -632,7 +632,7 @@ maven_jar(
 HTTPCOMP_VERS = "4.4.1"

 maven_jar(
-    name = "fluent_hc",
+    name = "fluent-hc",
    artifact = "org.apache.httpcomponents:fluent-hc:" + HTTPCOMP_VERS,
    sha1 = "96fb842b68a44cc640c661186828b60590c71261",
 )
@ -670,14 +670,14 @@ maven_jar(
 )

 maven_jar(
-    name = "hamcrest_core",
+    name = "hamcrest-core",
    artifact = "org.hamcrest:hamcrest-core:1.3",
    sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0",
 )

 # Only needed when jgit is built from the development tree
 maven_jar(
-    name = "hamcrest_library",
+    name = "hamcrest-library",
    artifact = "org.hamcrest:hamcrest-library:1.3",
    sha1 = "4785a3c21320980282f9f33d0d1264a69040538f",
 )
@ -716,7 +716,7 @@ maven_jar(
 )

 maven_jar(
-    name = "cglib_3_2",
+    name = "cglib-3_2",
    artifact = "cglib:cglib-nodep:3.2.0",
    sha1 = "cf1ca207c15b04ace918270b6cb3f5601160cdfd",
 )
@ -730,37 +730,37 @@ maven_jar(
 POWERM_VERS = "1.6.1"

 maven_jar(
-    name = "powermock_module_junit4",
+    name = "powermock-module-junit4",
    artifact = "org.powermock:powermock-module-junit4:" + POWERM_VERS,
    sha1 = "ea8530b2848542624f110a393513af397b37b9cf",
 )

 maven_jar(
-    name = "powermock_module_junit4_common",
+    name = "powermock-module-junit4-common",
    artifact = "org.powermock:powermock-module-junit4-common:" + POWERM_VERS,
    sha1 = "7222ced54dabc310895d02e45c5428ca05193cda",
 )

 maven_jar(
-    name = "powermock_reflect",
+    name = "powermock-reflect",
    artifact = "org.powermock:powermock-reflect:" + POWERM_VERS,
    sha1 = "97d25eda8275c11161bcddda6ef8beabd534c878",
 )

 maven_jar(
-    name = "powermock_api_easymock",
+    name = "powermock-api-easymock",
    artifact = "org.powermock:powermock-api-easymock:" + POWERM_VERS,
    sha1 = "aa740ecf89a2f64d410b3d93ef8cd6833009ef00",
 )

 maven_jar(
-    name = "powermock_api_support",
+    name = "powermock-api-support",
    artifact = "org.powermock:powermock-api-support:" + POWERM_VERS,
    sha1 = "592ee6d929c324109d3469501222e0c76ccf0869",
 )

 maven_jar(
-    name = "powermock_core",
+    name = "powermock-core",
    artifact = "org.powermock:powermock-core:" + POWERM_VERS,
    sha1 = "5afc1efce8d44ed76b30af939657bd598e45d962",
 )
@ -781,61 +781,61 @@ maven_jar(
 JETTY_VERS = "9.3.18.v20170406"

 maven_jar(
-    name = "jetty_servlet",
+    name = "jetty-servlet",
    artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VERS,
    sha1 = "534e7fa0e4fb6e08f89eb3f6a8c48b4f81ff5738",
 )

 maven_jar(
-    name = "jetty_security",
+    name = "jetty-security",
    artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VERS,
    sha1 = "16b900e91b04511f42b706c925c8af6023d2c05e",
 )

 maven_jar(
-    name = "jetty_servlets",
+    name = "jetty-servlets",
    artifact = "org.eclipse.jetty:jetty-servlets:" + JETTY_VERS,
    sha1 = "f9311d1d8e6124d2792f4db5b29514d0ecf46812",
 )

 maven_jar(
-    name = "jetty_server",
+    name = "jetty-server",
    artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VERS,
    sha1 = "0a32feea88cba2d43951d22b60861c643454bb3f",
 )

 maven_jar(
-    name = "jetty_jmx",
+    name = "jetty-jmx",
    artifact = "org.eclipse.jetty:jetty-jmx:" + JETTY_VERS,
    sha1 = "f988136dc5aa634afed6c5a35d910ee9599c6c23",
 )

 maven_jar(
-    name = "jetty_continuation",
+    name = "jetty-continuation",
    artifact = "org.eclipse.jetty:jetty-continuation:" + JETTY_VERS,
    sha1 = "3c5d89c8204d4a48a360087f95e4cbd4520b5de0",
 )

 maven_jar(
-    name = "jetty_http",
+    name = "jetty-http",
    artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VERS,
    sha1 = "30ece6d732d276442d513b94d914de6fa1075fae",
 )

 maven_jar(
-    name = "jetty_io",
+    name = "jetty-io",
    artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VERS,
    sha1 = "36cb411ee89be1b527b0c10747aa3153267fc3ec",
 )

 maven_jar(
-    name = "jetty_util",
+    name = "jetty-util",
    artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VERS,
    sha1 = "8600b7d028a38cb462eff338de91390b3ff5040e",
 )

 maven_jar(
-    name = "openid_consumer",
+    name = "openid-consumer",
    artifact = "org.openid4java:openid4java:0.9.8",
    sha1 = "de4f1b33d3b0f0b2ab1d32834ec1190b39db4160",
 )
@ -872,14 +872,14 @@ maven_jar(
 )

 maven_jar(
-    name = "diff_match_patch",
+    name = "diff-match-patch",
    artifact = "org.webjars:google-diff-match-patch:" + DIFF_MATCH_PATCH_VERSION,
    attach_source = False,
    sha1 = "0cf1782dbcb8359d95070da9176059a5a9d37709",
 )

 maven_jar(
-    name = "commons_io",
+    name = "commons-io",
    artifact = "commons-io:commons-io:1.4",
    sha1 = "a8762d07e76cfde2395257a5da47ba7c1dbd3dce",
 )
@ -905,7 +905,7 @@ maven_jar(
 JACKSON_VERSION = "2.8.9"

 maven_jar(
-    name = "jackson_core",
+    name = "jackson-core",
    artifact = "com.fasterxml.jackson.core:jackson-core:" + JACKSON_VERSION,
    sha1 = "569b1752705da98f49aabe2911cc956ff7d8ed9d",
 )
@ -917,7 +917,7 @@ maven_jar(
 )

 maven_jar(
-    name = "httpcore_nio",
+    name = "httpcore-nio",
    artifact = "org.apache.httpcomponents:httpcore-nio:" + HTTPCOMP_VERS,
    sha1 = "a8c5e3c3bfea5ce23fb647c335897e415eb442e3",
 )
@ -929,13 +929,13 @@ maven_jar(
 )

 maven_jar(
-    name = "duct_tape",
+    name = "duct-tape",
    artifact = "org.rnorth.duct-tape:duct-tape:1.0.7",
    sha1 = "a26b5d90d88c91321dc7a3734ea72d2fc019ebb6",
 )

 maven_jar(
-    name = "visible_assertions",
+    name = "visible-assertions",
    artifact = "org.rnorth.visible-assertions:visible-assertions:2.1.0",
    sha1 = "f2fcff2862860828ac38a5e1f14d941787c06b13",
 )
--- a/gerrit-plugin-gwtui/BUILD
+++ b/gerrit-plugin-gwtui/BUILD
@ -67,7 +67,7 @@ java_doc(
    libs = DEPS + [
        ":gwtui-api-lib",
        "//lib:gwtjsonrpc",
-        "//lib:gwtorm_client",
+        "//lib:gwtorm-client",
        "//lib/gwt:dev",
        "//gerrit-gwtui-common:client-lib",
        "//java/com/google/gerrit/common:client",
--- a/java/com/google/gerrit/acceptance/BUILD
+++ b/java/com/google/gerrit/acceptance/BUILD
@ -85,7 +85,7 @@ java_library2(
        "//lib/httpcomponents:httpcore",
        "//lib/jetty:servlet",
        "//lib/jgit/org.eclipse.jgit.junit:junit",
-        "//lib/log:impl_log4j",
+        "//lib/log:impl-log4j",
        "//lib/log:log4j",
        "//lib/truth",
        "//lib/truth:truth-java8-extension",
--- a/java/com/google/gerrit/common/BUILD
+++ b/java/com/google/gerrit/common/BUILD
@ -20,7 +20,7 @@ gwt_module(
        "//java/com/google/gerrit/extensions:api",
        "//java/com/google/gerrit/prettify:client",
        "//lib:guava",
-        "//lib:gwtorm_client",
+        "//lib:gwtorm-client",
        "//lib:servlet-api-3_1",
        "//lib/auto:auto-value",
        "//lib/auto:auto-value-annotations",
--- a/java/com/google/gerrit/index/BUILD
+++ b/java/com/google/gerrit/index/BUILD
@ -20,7 +20,7 @@ java_library(
    ],
    deps = [
        ":query_exception",
-        "//lib/antlr:java_runtime",
+        "//lib/antlr:java-runtime",
    ],
 )

@ -40,7 +40,7 @@ java_library(
        "//lib:guava",
        "//lib:gwtjsonrpc",
        "//lib:gwtorm",
-        "//lib/antlr:java_runtime",
+        "//lib/antlr:java-runtime",
        "//lib/auto:auto-value",
        "//lib/auto:auto-value-annotations",
        "//lib/flogger:api",
--- a/java/com/google/gerrit/reviewdb/BUILD
+++ b/java/com/google/gerrit/reviewdb/BUILD
@ -10,8 +10,8 @@ gwt_module(
    gwt_xml = "ReviewDB.gwt.xml",
    deps = [
        "//java/com/google/gerrit/extensions:client",
-        "//lib:gwtorm_client",
-        "//lib:gwtorm_client_src",
+        "//lib:gwtorm-client",
+        "//lib:gwtorm-client_src",
    ],
 )

--- a/javatests/com/google/gerrit/acceptance/server/rules/BUILD
+++ b/javatests/com/google/gerrit/acceptance/server/rules/BUILD
@ -5,6 +5,6 @@ acceptance_tests(
    group = "server_rules",
    labels = ["server"],
    deps = [
-        "@prolog_runtime//jar",
+        "@prolog-runtime//jar",
    ],
 )
--- a/javatests/com/google/gerrit/index/BUILD
+++ b/javatests/com/google/gerrit/index/BUILD
@ -11,7 +11,7 @@ junit_tests(
        "//java/com/google/gerrit/index:query_parser",
        "//lib:guava",
        "//lib:junit",
-        "//lib/antlr:java_runtime",
+        "//lib/antlr:java-runtime",
        "//lib/jgit/org.eclipse.jgit:jgit",
        "//lib/truth",
    ],
--- a/lib/BUILD
+++ b/lib/BUILD
@ -16,14 +16,14 @@ java_library(
    data = ["//lib:LICENSE-Apache2.0"],
    neverlink = 1,
    visibility = ["//visibility:public"],
-    exports = ["@servlet_api_3_1//jar"],
+    exports = ["@servlet-api-3_1//jar"],
 )

 java_library(
    name = "servlet-api-3_1-without-neverlink",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@servlet_api_3_1//jar"],
+    exports = ["@servlet-api-3_1//jar"],
 )

 java_library(
@ -48,17 +48,17 @@ java_library(
 )

 java_library(
-    name = "gwtorm_client",
+    name = "gwtorm-client",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@gwtorm_client//jar"],
+    exports = ["@gwtorm-client//jar"],
 )

 java_library(
-    name = "gwtorm_client_src",
+    name = "gwtorm-client_src",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@gwtorm_client//jar:src"],
+    exports = ["@gwtorm-client//jar:src"],
 )

 java_library(
@ -71,7 +71,7 @@ java_library(
 java_library(
    name = "gwtorm",
    visibility = ["//visibility:public"],
-    exports = [":gwtorm_client"],
+    exports = [":gwtorm-client"],
    runtime_deps = [":protobuf"],
 )

@ -151,21 +151,21 @@ java_library(
    name = "tukaani-xz",
    data = ["//lib:LICENSE-xz"],
    visibility = ["//visibility:public"],
-    exports = ["@tukaani_xz//jar"],
+    exports = ["@tukaani-xz//jar"],
 )

 java_library(
    name = "mime-util",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@mime_util//jar"],
+    exports = ["@mime-util//jar"],
 )

 java_library(
    name = "guava-retrying",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@guava_retrying//jar"],
+    exports = ["@guava-retrying//jar"],
    runtime_deps = [":jsr305"],
 )

@ -180,7 +180,7 @@ java_library(
    name = "blame-cache",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@blame_cache//jar"],
+    exports = ["@blame-cache//jar"],
 )

 java_library(
@ -213,7 +213,7 @@ java_library(
    name = "hamcrest-core",
    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
    visibility = ["//visibility:public"],
-    exports = ["@hamcrest_core//jar"],
+    exports = ["@hamcrest-core//jar"],
 )

 java_library(
@ -245,7 +245,7 @@ java_library(
        ":protobuf",
        "//lib/guice",
        "//lib/guice:guice-assistedinject",
-        "//lib/guice:javax-inject",
+        "//lib/guice:javax_inject",
        "//lib/ow2:ow2-asm",
        "//lib/ow2:ow2-asm-analysis",
        "//lib/ow2:ow2-asm-commons",
@ -257,7 +257,7 @@ java_library(
    name = "html-types",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@html_types//jar"],
+    exports = ["@html-types//jar"],
 )

 java_library(
--- a/lib/antlr/BUILD
+++ b/lib/antlr/BUILD
@ -10,10 +10,10 @@ package(default_visibility = ["//java/com/google/gerrit/index:__pkg__"])
 ]]

 java_library(
-    name = "java_runtime",
+    name = "java-runtime",
    data = ["//lib:LICENSE-antlr"],
    visibility = ["//visibility:public"],
-    exports = ["@java_runtime//jar"],
+    exports = ["@java-runtime//jar"],
 )

 # See https://github.com/bazelbuild/bazel/issues/3542
@ -29,10 +29,10 @@ java_binary(
 java_library(
    name = "tool",
    data = ["//lib:LICENSE-antlr"],
-    exports = ["@org_antlr//jar"],
+    exports = ["@org-antlr//jar"],
    runtime_deps = [
        ":antlr27",
-        ":java_runtime",
+        ":java-runtime",
        ":stringtemplate",
    ],
 )
--- a/lib/auto/BUILD
+++ b/lib/auto/BUILD
@ -2,8 +2,8 @@ java_plugin(
    name = "auto-annotation-plugin",
    processor_class = "com.google.auto.value.processor.AutoAnnotationProcessor",
    deps = [
-        "@auto_value//jar",
-        "@auto_value_annotations//jar",
+        "@auto-value-annotations//jar",
+        "@auto-value//jar",
    ],
 )

@ -11,8 +11,8 @@ java_plugin(
    name = "auto-value-plugin",
    processor_class = "com.google.auto.value.processor.AutoValueProcessor",
    deps = [
-        "@auto_value//jar",
-        "@auto_value_annotations//jar",
+        "@auto-value-annotations//jar",
+        "@auto-value//jar",
    ],
 )

@ -24,7 +24,7 @@ java_library(
        ":auto-value-plugin",
    ],
    visibility = ["//visibility:public"],
-    exports = ["@auto_value//jar"],
+    exports = ["@auto-value//jar"],
 )

 java_library(
@ -35,5 +35,5 @@ java_library(
        ":auto-value-plugin",
    ],
    visibility = ["//visibility:public"],
-    exports = ["@auto_value_annotations//jar"],
+    exports = ["@auto-value-annotations//jar"],
 )
--- a/lib/codemirror/BUILD
+++ b/lib/codemirror/BUILD
@ -5,7 +5,7 @@ load("//lib/codemirror:cm.bzl", "pkg_cm")
 java_library(
    name = "diff-match-patch",
    data = ["//lib:LICENSE-Apache2.0"],
-    runtime_deps = ["@diff_match_patch//jar"],
+    runtime_deps = ["@diff-match-patch//jar"],
 )

 pkg_cm()
--- a/lib/codemirror/cm.bzl
+++ b/lib/codemirror/cm.bzl
@ -310,13 +310,13 @@ def pkg_cm():
          "echo '/** @license' >>$@",
          "echo 'LICENSE-Apache2.0' >>$@",
          "echo '*/' >>$@",
-          'unzip -p $(location @diff_match_patch//jar) %s/diff_match_patch.js >>$@' % DIFF_MATCH_PATCH_TOP,
+          'unzip -p $(location @diff-match-patch//jar) %s/diff_match_patch.js >>$@' % DIFF_MATCH_PATCH_TOP,
          "echo ';' >> $@",
          'unzip -p $(location %s) %s/addon/merge/merge.js >>$@' % (archive, top)
        ]
      ),
      tools = [
-        '@diff_match_patch//jar',
+        '@diff-match-patch//jar',
        # dependency just for license tracking.
        ':diff-match-patch',
        archive,
--- a/lib/commons/BUILD
+++ b/lib/commons/BUILD
@ -4,41 +4,41 @@ java_library(
    name = "codec",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@commons_codec//jar"],
+    exports = ["@commons-codec//jar"],
 )

 java_library(
    name = "compress",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@commons_compress//jar"],
+    exports = ["@commons-compress//jar"],
 )

 java_library(
    name = "lang",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@commons_lang//jar"],
+    exports = ["@commons-lang//jar"],
 )

 java_library(
    name = "lang3",
    data = ["//lib:LICENSE-Apache2.0"],
-    exports = ["@commons_lang3//jar"],
+    exports = ["@commons-lang3//jar"],
 )

 java_library(
    name = "net",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@commons_net//jar"],
+    exports = ["@commons-net//jar"],
 )

 java_library(
    name = "dbcp",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@commons_dbcp//jar"],
+    exports = ["@commons-dbcp//jar"],
    runtime_deps = [":pool"],
 )

@ -46,19 +46,19 @@ java_library(
    name = "pool",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@commons_pool//jar"],
+    exports = ["@commons-pool//jar"],
 )

 java_library(
    name = "validator",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@commons_validator//jar"],
+    exports = ["@commons-validator//jar"],
 )

 java_library(
    name = "io",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@commons_io//jar"],
+    exports = ["@commons-io//jar"],
 )
--- a/lib/dropwizard/BUILD
+++ b/lib/dropwizard/BUILD
@ -2,5 +2,5 @@ java_library(
    name = "dropwizard-core",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@dropwizard_core//jar"],
+    exports = ["@dropwizard-core//jar"],
 )
--- a/lib/easymock/BUILD
+++ b/lib/easymock/BUILD
@ -13,7 +13,7 @@ java_library(
    name = "cglib-3_2",
    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
    visibility = ["//visibility:public"],
-    exports = ["@cglib_3_2//jar"],
+    exports = ["@cglib-3_2//jar"],
 )

 java_library(
--- a/lib/guice/BUILD
+++ b/lib/guice/BUILD
@ -3,16 +3,16 @@ java_library(
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
    exports = [
-        ":guice_library",
-        ":javax-inject",
+        ":guice-library",
+        ":javax_inject",
    ],
 )

 java_library(
-    name = "guice_library",
+    name = "guice-library",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@guice_library//jar"],
+    exports = ["@guice-library//jar"],
    runtime_deps = ["aopalliance"],
 )

@ -20,7 +20,7 @@ java_library(
    name = "guice-assistedinject",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@guice_assistedinject//jar"],
+    exports = ["@guice-assistedinject//jar"],
    runtime_deps = [":guice"],
 )

@ -28,7 +28,7 @@ java_library(
    name = "guice-servlet",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@guice_servlet//jar"],
+    exports = ["@guice-servlet//jar"],
    runtime_deps = [":guice"],
 )

@ -39,7 +39,7 @@ java_library(
 )

 java_library(
-    name = "javax-inject",
+    name = "javax_inject",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
    exports = ["@javax_inject//jar"],
--- a/lib/gwt/BUILD
+++ b/lib/gwt/BUILD
@ -2,7 +2,7 @@
    name = n,
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@%s//jar" % n.replace("-", "_")],
+    exports = ["@%s//jar" % n],
 ) for n in [
    "ant",
    "colt",
@ -34,12 +34,12 @@ java_library(
    name = "javax-validation_src",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@javax_validation//jar:src"],
+    exports = ["@javax-validation//jar:src"],
 )

 java_library(
    name = "jsinterop-annotations_src",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@jsinterop_annotations//jar:src"],
+    exports = ["@jsinterop-annotations//jar:src"],
 )
--- a/lib/httpcomponents/BUILD
+++ b/lib/httpcomponents/BUILD
@ -4,7 +4,7 @@ java_library(
    name = "fluent-hc",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@fluent_hc//jar"],
+    exports = ["@fluent-hc//jar"],
    runtime_deps = [":httpclient"],
 )

@ -43,5 +43,5 @@ java_library(
 java_library(
    name = "httpcore-nio",
    data = ["//lib:LICENSE-Apache2.0"],
-    exports = ["@httpcore_nio//jar"],
+    exports = ["@httpcore-nio//jar"],
 )
--- a/lib/jackson/BUILD
+++ b/lib/jackson/BUILD
@ -5,5 +5,5 @@ VERSION = "2.6.6"
 java_library(
    name = "jackson-core",
    data = ["//lib:LICENSE-Apache2.0"],
-    exports = ["@jackson_core//jar"],
+    exports = ["@jackson-core//jar"],
 )
--- a/lib/jetty/BUILD
+++ b/lib/jetty/BUILD
@ -2,7 +2,7 @@ java_library(
    name = "servlet",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@jetty_servlet//jar"],
+    exports = ["@jetty-servlet//jar"],
    runtime_deps = [":security"],
 )

@ -10,7 +10,7 @@ java_library(
    name = "security",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@jetty_security//jar"],
+    exports = ["@jetty-security//jar"],
    runtime_deps = [":server"],
 )

@ -18,7 +18,7 @@ java_library(
    name = "servlets",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@jetty_servlets//jar"],
+    exports = ["@jetty-servlets//jar"],
 )

 java_library(
@ -28,7 +28,7 @@ java_library(
    exports = [
        ":continuation",
        ":http",
-        "@jetty_server//jar",
+        "@jetty-server//jar",
    ],
 )

@ -39,7 +39,7 @@ java_library(
    exports = [
        ":continuation",
        ":http",
-        "@jetty_jmx//jar",
+        "@jetty-jmx//jar",
    ],
 )

@ -47,7 +47,7 @@ java_library(
    name = "continuation",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@jetty_continuation//jar"],
+    exports = ["@jetty-continuation//jar"],
 )

 java_library(
@ -56,7 +56,7 @@ java_library(
    visibility = ["//visibility:public"],
    exports = [
        ":io",
-        "@jetty_http//jar",
+        "@jetty-http//jar",
    ],
 )

@ -65,12 +65,12 @@ java_library(
    data = ["//lib:LICENSE-Apache2.0"],
    exports = [
        ":util",
-        "@jetty_io//jar",
+        "@jetty-io//jar",
    ],
 )

 java_library(
    name = "util",
    data = ["//lib:LICENSE-Apache2.0"],
-    exports = ["@jetty_util//jar"],
+    exports = ["@jetty-util//jar"],
 )
--- a/lib/jgit/jgit.bzl
+++ b/lib/jgit/jgit.bzl
@ -23,7 +23,7 @@ def jgit_repos():

 def jgit_maven_repos():
    maven_jar(
-        name = "jgit_lib",
+        name = "jgit-lib",
        artifact = "org.eclipse.jgit:org.eclipse.jgit:" + _JGIT_VERS,
        repository = _JGIT_REPO,
        sha1 = "265a39c017ecfeed7e992b6aaa336e515bf6e157",
@ -31,20 +31,20 @@ def jgit_maven_repos():
        unsign = True,
    )
    maven_jar(
-        name = "jgit_servlet",
+        name = "jgit-servlet",
        artifact = "org.eclipse.jgit:org.eclipse.jgit.http.server:" + _JGIT_VERS,
        repository = _JGIT_REPO,
        sha1 = "0d68f62286b5db759fdbeb122c789db1f833a06a",
        unsign = True,
    )
    maven_jar(
-        name = "jgit_archive",
+        name = "jgit-archive",
        artifact = "org.eclipse.jgit:org.eclipse.jgit.archive:" + _JGIT_VERS,
        repository = _JGIT_REPO,
        sha1 = "4cc3ed2c42ee63593fd1b16215fcf13eeefb833e",
    )
    maven_jar(
-        name = "jgit_junit",
+        name = "jgit-junit",
        artifact = "org.eclipse.jgit:org.eclipse.jgit.junit:" + _JGIT_VERS,
        repository = _JGIT_REPO,
        sha1 = "6f1bcc9ac22b31b5a6e1e68c08283850108b900c",
@ -53,11 +53,11 @@ def jgit_maven_repos():

 def jgit_dep(name):
  mapping = {
-      "@jgit_junit//jar": "@jgit//org.eclipse.jgit.junit:junit",
-      "@jgit_lib//jar:src": "@jgit//org.eclipse.jgit:libjgit-src.jar",
-      "@jgit_lib//jar": "@jgit//org.eclipse.jgit:jgit",
-      "@jgit_servlet//jar":"@jgit//org.eclipse.jgit.http.server:jgit-servlet",
-      "@jgit_archive//jar": "@jgit//org.eclipse.jgit.archive:jgit-archive",
+      "@jgit-junit//jar": "@jgit//org.eclipse.jgit.junit:junit",
+      "@jgit-lib//jar:src": "@jgit//org.eclipse.jgit:libjgit-src.jar",
+      "@jgit-lib//jar": "@jgit//org.eclipse.jgit:jgit",
+      "@jgit-servlet//jar":"@jgit//org.eclipse.jgit.http.server:jgit-servlet",
+      "@jgit-archive//jar": "@jgit//org.eclipse.jgit.archive:jgit-archive",
  }

  if LOCAL_JGIT_REPO:
--- a/lib/jgit/org.eclipse.jgit.archive/BUILD
+++ b/lib/jgit/org.eclipse.jgit.archive/BUILD
@ -4,6 +4,6 @@ java_library(
    name = "jgit-archive",
    data = ["//lib:LICENSE-jgit"],
    visibility = ["//visibility:public"],
-    exports = [jgit_dep("@jgit_archive//jar")],
+    exports = [jgit_dep("@jgit-archive//jar")],
    runtime_deps = ["//lib/jgit/org.eclipse.jgit:jgit"],
 )
--- a/lib/jgit/org.eclipse.jgit.http.server/BUILD
+++ b/lib/jgit/org.eclipse.jgit.http.server/BUILD
@ -4,6 +4,6 @@ java_library(
    name = "jgit-servlet",
    data = ["//lib:LICENSE-jgit"],
    visibility = ["//visibility:public"],
-    exports = [jgit_dep("@jgit_servlet//jar")],
+    exports = [jgit_dep("@jgit-servlet//jar")],
    runtime_deps = ["//lib/jgit/org.eclipse.jgit:jgit"],
 )
--- a/lib/jgit/org.eclipse.jgit.junit/BUILD
+++ b/lib/jgit/org.eclipse.jgit.junit/BUILD
@ -5,6 +5,6 @@ java_library(
    testonly = 1,
    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
    visibility = ["//visibility:public"],
-    exports = [jgit_dep("@jgit_junit//jar")],
+    exports = [jgit_dep("@jgit-junit//jar")],
    runtime_deps = ["//lib/jgit/org.eclipse.jgit:jgit"],
 )
--- a/lib/jgit/org.eclipse.jgit/BUILD
+++ b/lib/jgit/org.eclipse.jgit/BUILD
@ -4,7 +4,7 @@ java_library(
    name = "jgit",
    data = ["//lib:LICENSE-jgit"],
    visibility = ["//visibility:public"],
-    exports = [jgit_dep("@jgit_lib//jar")],
+    exports = [jgit_dep("@jgit-lib//jar")],
    runtime_deps = [
        ":javaewah",
        "//lib/log:api",
@ -13,7 +13,7 @@ java_library(

 alias(
    name = "jgit-source",
-    actual = jgit_dep("@jgit_lib//jar:src"),
+    actual = jgit_dep("@jgit-lib//jar:src"),
    visibility = ["//visibility:public"],
 )

--- a/lib/log/BUILD
+++ b/lib/log/BUILD
@ -5,21 +5,21 @@ java_library(
        "//lib/jgit/org.eclipse.jgit:__pkg__",
        "//plugins:__pkg__",
    ],
-    exports = ["@log_api//jar"],
+    exports = ["@log-api//jar"],
 )

 java_library(
    name = "ext",
    data = ["//lib:LICENSE-slf4j"],
    visibility = ["//visibility:public"],
-    exports = ["@log_ext//jar"],
+    exports = ["@log-ext//jar"],
 )

 java_library(
-    name = "impl_log4j",
+    name = "impl-log4j",
    data = ["//lib:LICENSE-slf4j"],
    visibility = ["//visibility:public"],
-    exports = ["@impl_log4j//jar"],
+    exports = ["@impl-log4j//jar"],
    runtime_deps = [":log4j"],
 )

@ -27,7 +27,7 @@ java_library(
    name = "jcl-over-slf4j",
    data = ["//lib:LICENSE-slf4j"],
    visibility = ["//visibility:public"],
-    exports = ["@jcl_over_slf4j//jar"],
+    exports = ["@jcl-over-slf4j//jar"],
 )

 java_library(
@ -41,7 +41,7 @@ java_library(
    name = "jsonevent-layout",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@jsonevent_layout//jar"],
+    exports = ["@jsonevent-layout//jar"],
    runtime_deps = [
        ":json-smart",
        "//lib/commons:lang",
@ -52,5 +52,5 @@ java_library(
    name = "json-smart",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@json_smart//jar"],
+    exports = ["@json-smart//jar"],
 )
--- a/lib/lucene/BUILD
+++ b/lib/lucene/BUILD
@ -7,8 +7,8 @@ load("//tools/bzl:maven.bzl", "merge_maven_jars")
 merge_maven_jars(
    name = "lucene-core-and-backward-codecs",
    srcs = [
-        "@backward_codecs//jar",
-        "@lucene_core//jar",
+        "@backward-codecs//jar",
+        "@lucene-core//jar",
    ],
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
@ -18,7 +18,7 @@ java_library(
    name = "lucene-analyzers-common",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@lucene_analyzers_common//jar"],
+    exports = ["@lucene-analyzers-common//jar"],
    runtime_deps = [":lucene-core-and-backward-codecs"],
 )

@ -26,14 +26,14 @@ java_library(
    name = "lucene-core",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@lucene_core//jar"],
+    exports = ["@lucene-core//jar"],
 )

 java_library(
    name = "lucene-misc",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@lucene_misc//jar"],
+    exports = ["@lucene-misc//jar"],
    runtime_deps = [":lucene-core-and-backward-codecs"],
 )

@ -41,6 +41,6 @@ java_library(
    name = "lucene-queryparser",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@lucene_queryparser//jar"],
+    exports = ["@lucene-queryparser//jar"],
    runtime_deps = [":lucene-core-and-backward-codecs"],
 )
--- a/lib/mime4j/BUILD
+++ b/lib/mime4j/BUILD
@ -2,12 +2,12 @@ java_library(
    name = "core",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@mime4j_core//jar"],
+    exports = ["@mime4j-core//jar"],
 )

 java_library(
    name = "dom",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@mime4j_dom//jar"],
+    exports = ["@mime4j-dom//jar"],
 )
--- a/lib/mina/BUILD
+++ b/lib/mina/BUILD
@ -22,5 +22,5 @@ java_library(
    name = "core",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@mina_core//jar"],
+    exports = ["@mina-core//jar"],
 )
--- a/lib/openid/BUILD
+++ b/lib/openid/BUILD
@ -2,7 +2,7 @@ java_library(
    name = "consumer",
    data = ["//lib:LICENSE-Apache2.0"],
    visibility = ["//visibility:public"],
-    exports = ["@openid_consumer//jar"],
+    exports = ["@openid-consumer//jar"],
    runtime_deps = [
        ":nekohtml",
        ":xerces",
--- a/lib/ow2/BUILD
+++ b/lib/ow2/BUILD
@ -2,21 +2,21 @@ java_library(
    name = "ow2-asm",
    data = ["//lib:LICENSE-ow2"],
    visibility = ["//visibility:public"],
-    exports = ["@ow2_asm//jar"],
+    exports = ["@ow2-asm//jar"],
 )

 java_library(
    name = "ow2-asm-analysis",
    data = ["//lib:LICENSE-ow2"],
    visibility = ["//visibility:public"],
-    exports = ["@ow2_asm_analysis//jar"],
+    exports = ["@ow2-asm-analysis//jar"],
 )

 java_library(
    name = "ow2-asm-commons",
    data = ["//lib:LICENSE-ow2"],
    visibility = ["//visibility:public"],
-    exports = ["@ow2_asm_commons//jar"],
+    exports = ["@ow2-asm-commons//jar"],
    runtime_deps = [":ow2-asm-tree"],
 )

@ -24,12 +24,12 @@ java_library(
    name = "ow2-asm-tree",
    data = ["//lib:LICENSE-ow2"],
    visibility = ["//visibility:public"],
-    exports = ["@ow2_asm_tree//jar"],
+    exports = ["@ow2-asm-tree//jar"],
 )

 java_library(
    name = "ow2-asm-util",
    data = ["//lib:LICENSE-ow2"],
    visibility = ["//visibility:public"],
-    exports = ["@ow2_asm_util//jar"],
+    exports = ["@ow2-asm-util//jar"],
 )
--- a/lib/powermock/BUILD
+++ b/lib/powermock/BUILD
@ -5,7 +5,7 @@ java_library(
    exports = [
        ":powermock-module-junit4-common",
        "//lib:junit",
-        "@powermock_module_junit4//jar",
+        "@powermock-module-junit4//jar",
    ],
 )

@ -16,7 +16,7 @@ java_library(
    exports = [
        ":powermock-reflect",
        "//lib:junit",
-        "@powermock_module_junit4_common//jar",
+        "@powermock-module-junit4-common//jar",
    ],
 )

@ -27,7 +27,7 @@ java_library(
    exports = [
        "//lib:junit",
        "//lib/easymock:objenesis",
-        "@powermock_reflect//jar",
+        "@powermock-reflect//jar",
    ],
 )

@ -38,7 +38,7 @@ java_library(
    exports = [
        ":powermock-api-support",
        "//lib/easymock",
-        "@powermock_api_easymock//jar",
+        "@powermock-api-easymock//jar",
    ],
 )

@ -50,7 +50,7 @@ java_library(
        ":powermock-core",
        ":powermock-reflect",
        "//lib:junit",
-        "@powermock_api_support//jar",
+        "@powermock-api-support//jar",
    ],
 )

@ -62,6 +62,6 @@ java_library(
        ":powermock-reflect",
        "//lib:javassist",
        "//lib:junit",
-        "@powermock_core//jar",
+        "@powermock-core//jar",
    ],
 )
--- a/lib/prolog/BUILD
+++ b/lib/prolog/BUILD
@ -2,21 +2,21 @@ java_library(
    name = "runtime",
    data = ["//lib:LICENSE-prologcafe"],
    visibility = ["//visibility:public"],
-    exports = ["@prolog_runtime//jar"],
+    exports = ["@prolog-runtime//jar"],
 )

 java_library(
    name = "runtime-neverlink",
    data = ["//lib:LICENSE-prologcafe"],
    visibility = ["//visibility:public"],
-    exports = ["@prolog_runtime//jar:neverlink"],
+    exports = ["@prolog-runtime//jar:neverlink"],
 )

 java_library(
    name = "compiler",
    data = ["//lib:LICENSE-prologcafe"],
    visibility = ["//visibility:public"],
-    exports = ["@prolog_compiler//jar"],
+    exports = ["@prolog-compiler//jar"],
    runtime_deps = [
        ":io",
        ":runtime",
@ -26,7 +26,7 @@ java_library(
 java_library(
    name = "io",
    data = ["//lib:LICENSE-prologcafe"],
-    exports = ["@prolog_io//jar"],
+    exports = ["@prolog-io//jar"],
 )

 java_library(
@ -41,14 +41,14 @@ java_library(
 )

 java_binary(
-    name = "compiler_bin",
+    name = "compiler-bin",
    main_class = "BuckPrologCompiler",
    visibility = ["//visibility:public"],
-    runtime_deps = [":compiler_lib"],
+    runtime_deps = [":compiler-lib"],
 )

 java_library(
-    name = "compiler_lib",
+    name = "compiler-lib",
    srcs = ["java/BuckPrologCompiler.java"],
    visibility = ["//visibility:public"],
    deps = [
--- a/lib/prolog/prolog.bzl
+++ b/lib/prolog/prolog.bzl
@ -19,11 +19,11 @@ def prolog_cafe_library(
    **kwargs):
  native.genrule(
    name = name + '__pl2j',
-    cmd = '$(location //lib/prolog:compiler_bin) ' +
+    cmd = '$(location //lib/prolog:compiler-bin) ' +
      '$$(dirname $@) $@ ' +
      '$(SRCS)',
    srcs = srcs,
-    tools = ['//lib/prolog:compiler_bin'],
+    tools = ['//lib/prolog:compiler-bin'],
    outs = [ name + '.srcjar' ],
  )
  native.java_library(
--- a/lib/testcontainers/BUILD
+++ b/lib/testcontainers/BUILD
@ -3,7 +3,7 @@ java_library(
    testonly = True,
    data = ["//lib:LICENSE-testcontainers"],
    visibility = ["//visibility:public"],
-    exports = ["@duct_tape//jar"],
+    exports = ["@duct-tape//jar"],
 )

 java_library(
@ -11,7 +11,7 @@ java_library(
    testonly = True,
    data = ["//lib:LICENSE-testcontainers"],
    visibility = ["//visibility:public"],
-    exports = ["@visible_assertions//jar"],
+    exports = ["@visible-assertions//jar"],
 )

 java_library(
--- a/plugins/BUILD
+++ b/plugins/BUILD
@ -45,7 +45,7 @@ EXPORTS = [
    "//lib/guice:guice",
    "//lib/guice:guice-assistedinject",
    "//lib/guice:guice-servlet",
-    "//lib/guice:javax-inject",
+    "//lib/guice:javax_inject",
    "//lib/httpcomponents:httpclient",
    "//lib/httpcomponents:httpcore",
    "//lib/jackson:jackson-core",
--- a/tools/bzl/pkg_war.bzl
+++ b/tools/bzl/pkg_war.bzl
@ -23,7 +23,7 @@ LIBS = [
    "//lib/bouncycastle:bcpkix",
    "//lib/bouncycastle:bcprov",
    "//lib/bouncycastle:bcpg",
-    "//lib/log:impl_log4j",
+    "//lib/log:impl-log4j",
    "//resources:log4j-config",
 ]

--- a/tools/eclipse/BUILD
+++ b/tools/eclipse/BUILD
@ -31,7 +31,7 @@ DEPS = [
    "//lib/gwt:tapestry",
    "//lib/gwt:w3c-css-sac",
    "//lib/jetty:servlets",
-    "//lib/prolog:compiler_lib",
+    "//lib/prolog:compiler-lib",
    # TODO(davido): I do not understand why it must be on the Eclipse classpath
    #'//Documentation:index',
 ]