Bazel: Use hyphen instead of underscore in external repository names
Recent Bazel versions support the hyphen character in external
repository names. On the Gerrit project, the repository names
were harmonized to consistently use hyphen.
As a side effect, it is no longer possible to build jgit from source
in the gerrit tree, due to the different repository names.
Rename the dependencies to use hyphens, consistent with gerrit.
Change-Id: Ideebd858ddd3f0e6f765643001642dfb6c12441f
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
diff --git a/WORKSPACE b/WORKSPACE
index efa161b..c5eae1d 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -34,43 +34,43 @@
)
maven_jar(
- name = "commons_codec",
+ name = "commons-codec",
artifact = "commons-codec:commons-codec:1.4",
sha1 = "4216af16d38465bbab0f3dff8efa14204f7a399a",
)
maven_jar(
- name = "commons_logging",
+ name = "commons-logging",
artifact = "commons-logging:commons-logging:1.1.3",
sha1 = "f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f",
)
maven_jar(
- name = "log_api",
+ name = "log-api",
artifact = "org.slf4j:slf4j-api:1.7.2",
sha1 = "0081d61b7f33ebeab314e07de0cc596f8e858d97",
)
maven_jar(
- name = "slf4j_simple",
+ name = "slf4j-simple",
artifact = "org.slf4j:slf4j-simple:1.7.2",
sha1 = "760055906d7353ba4f7ce1b8908bc6b2e91f39fa",
)
maven_jar(
- name = "servlet_api_3_1",
+ name = "servlet-api-3_1",
artifact = "javax.servlet:javax.servlet-api:3.1.0",
sha1 = "3cd63d075497751784b2fa84be59432f4905bf7c",
)
maven_jar(
- name = "commons_compress",
+ name = "commons-compress",
artifact = "org.apache.commons:commons-compress:1.6",
sha1 = "c7d9b580aff9e9f1998361f16578e63e5c064699",
)
maven_jar(
- name = "tukaani_xz",
+ name = "tukaani-xz",
artifact = "org.tukaani:xz:1.3",
sha1 = "66db21c8484120cb6a51b5b3ea47b6f383942bec",
)
@@ -88,13 +88,13 @@
)
maven_jar(
- name = "hamcrest_library",
+ name = "hamcrest-library",
artifact = "org.hamcrest:hamcrest-library:1.3",
sha1 = "4785a3c21320980282f9f33d0d1264a69040538f",
)
maven_jar(
- name = "hamcrest_core",
+ name = "hamcrest-core",
artifact = "org.hamcrest:hamcrest-core:1.3",
sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0",
)
@@ -108,42 +108,42 @@
JETTY_VER = "9.3.17.v20170317"
maven_jar(
- name = "jetty_servlet",
+ name = "jetty-servlet",
artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VER,
sha1 = "ed6986b0d0ca7b9b0f9015c9efb80442e3043a8e",
src_sha1 = "ee6b4784a00a92e5c1b6111033b7ae41ac6052a3",
)
maven_jar(
- name = "jetty_security",
+ name = "jetty-security",
artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER,
sha1 = "ca52535569445682d42aaa97c7039442719a0507",
src_sha1 = "2ff9f4fb18b320fd5a0272a427bacc4d5fe7bc86",
)
maven_jar(
- name = "jetty_server",
+ name = "jetty-server",
artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER,
sha1 = "194e9a02e6ba249ef4a3f4bd56b4993087992299",
src_sha1 = "0c9bd572f530c411592aefb71781ecca0b3719a9",
)
maven_jar(
- name = "jetty_http",
+ name = "jetty-http",
artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER,
sha1 = "6c02d728e15d4868486254039c867a1ac3e4a52e",
src_sha1 = "3c0a2a82792f268631b4fefd77be9f126ec974b1",
)
maven_jar(
- name = "jetty_io",
+ name = "jetty-io",
artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER,
sha1 = "756a8cd2a1cbfb84a94973b6332dd3eccd47c0cd",
src_sha1 = "a9afa99cccb19b441364fa805d027f457cbbb136",
)
maven_jar(
- name = "jetty_util",
+ name = "jetty-util",
artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER,
sha1 = "b8512ab02819de01f0f5a5c6026163041f579beb",
src_sha1 = "96f8e3dcdc3660a5c91f19c46695daa70ac95625",
diff --git a/lib/BUILD b/lib/BUILD
index ffe66a3..346e1fd 100644
--- a/lib/BUILD
+++ b/lib/BUILD
@@ -13,19 +13,19 @@
"//org.eclipse.jgit.archive:__pkg__",
"//org.eclipse.jgit.pgm.test:__pkg__",
],
- exports = ["@commons_compress//jar"],
+ exports = ["@commons-compress//jar"],
)
java_library(
name = "commons-codec",
- exports = ["@commons_codec//jar"],
+ exports = ["@commons-codec//jar"],
)
java_library(
name = "commons-logging",
testonly = 1,
visibility = ["//visibility:public"],
- exports = ["@commons_logging//jar"],
+ exports = ["@commons-logging//jar"],
)
java_library(
@@ -65,7 +65,7 @@
name = "jetty-http",
# TODO: This should be testonly but org.eclipse.jgit.pgm depends on it.
visibility = ["//visibility:public"],
- exports = ["@jetty_http//jar"],
+ exports = ["@jetty-http//jar"],
runtime_deps = [":commons-codec"],
)
@@ -73,35 +73,35 @@
name = "jetty-io",
# TODO: This should be testonly but org.eclipse.jgit.pgm depends on it.
visibility = ["//visibility:public"],
- exports = ["@jetty_io//jar"],
+ exports = ["@jetty-io//jar"],
)
java_library(
name = "jetty-security",
# TODO: This should be testonly but org.eclipse.jgit.pgm depends on it.
visibility = ["//visibility:public"],
- exports = ["@jetty_security//jar"],
+ exports = ["@jetty-security//jar"],
)
java_library(
name = "jetty-server",
# TODO: This should be testonly but org.eclipse.jgit.pgm depends on it.
visibility = ["//visibility:public"],
- exports = ["@jetty_server//jar"],
+ exports = ["@jetty-server//jar"],
)
java_library(
name = "jetty-servlet",
# TODO: This should be testonly but org.eclipse.jgit.pgm depends on it.
visibility = ["//visibility:public"],
- exports = ["@jetty_servlet//jar"],
+ exports = ["@jetty-servlet//jar"],
)
java_library(
name = "jetty-util",
# TODO: This should be testonly but org.eclipse.jgit.pgm depends on it.
visibility = ["//visibility:public"],
- exports = ["@jetty_util//jar"],
+ exports = ["@jetty-util//jar"],
)
java_library(
@@ -115,8 +115,8 @@
testonly = 1,
visibility = ["//visibility:public"],
exports = [
- "@hamcrest_core//jar",
- "@hamcrest_library//jar",
+ "@hamcrest-core//jar",
+ "@hamcrest-library//jar",
"@junit//jar",
],
)
@@ -132,25 +132,25 @@
"//org.eclipse.jgit.lfs.server.test:__pkg__",
"//org.eclipse.jgit.pgm:__pkg__",
],
- exports = ["@servlet_api_3_1//jar"],
+ exports = ["@servlet-api-3_1//jar"],
)
java_library(
name = "slf4j-api",
visibility = ["//visibility:public"],
- exports = ["@log_api//jar"],
+ exports = ["@log-api//jar"],
)
java_library(
name = "slf4j-simple",
testonly = 1,
visibility = ["//visibility:public"],
- exports = ["@slf4j_simple//jar"],
+ exports = ["@slf4j-simple//jar"],
)
java_library(
name = "xz",
testonly = 1,
visibility = ["//visibility:public"],
- exports = ["@tukaani_xz//jar"],
+ exports = ["@tukaani-xz//jar"],
)
