Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
bazlets: Replace native.git_repository with skylark rule
Harmonize external dependency names to use hyphen
Change-Id: I7bd4e18f58a37c3958911c1a563dd2741a8ad499
diff --git a/BUILD b/BUILD
index fc66e1c..051435c 100644
--- a/BUILD
+++ b/BUILD
@@ -18,9 +18,9 @@
],
resources = glob(["src/main/resources/**/*"]),
deps = [
- "@jgit_http_apache//jar",
- "@jgit_lfs//jar",
- "@jgit_lfs_server//jar",
+ "@jgit-http-apache//jar",
+ "@jgit-lfs//jar",
+ "@jgit-lfs-server//jar",
],
)
@@ -30,7 +30,7 @@
tags = ["lfs"],
deps = PLUGIN_DEPS + PLUGIN_TEST_DEPS + [
":lfs__plugin",
- "@jgit_lfs//jar",
+ "@jgit-lfs//jar",
],
)
@@ -40,6 +40,6 @@
visibility = ["//visibility:public"],
exports = PLUGIN_DEPS + PLUGIN_TEST_DEPS + [
":lfs__plugin",
- "@joda_time//jar",
+ "@joda-time//jar",
],
)
diff --git a/bazlets.bzl b/bazlets.bzl
index f97b72c..f089af4 100644
--- a/bazlets.bzl
+++ b/bazlets.bzl
@@ -1,10 +1,12 @@
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
+
NAME = "com_googlesource_gerrit_bazlets"
def load_bazlets(
commit,
local_path = None):
if not local_path:
- native.git_repository(
+ git_repository(
name = NAME,
remote = "https://gerrit.googlesource.com/bazlets",
commit = commit,
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 2f9fef4..146cf81 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -5,7 +5,7 @@
def external_plugin_deps():
maven_jar(
- name = "jgit_http_apache",
+ name = "jgit-http-apache",
artifact = "org.eclipse.jgit:org.eclipse.jgit.http.apache:" + JGIT_VERSION,
sha1 = "c6f4ed2fc4ce6f6c4b0a0dfa54bb4ab7dbbee557",
repository = REPO,
@@ -17,7 +17,7 @@
)
maven_jar(
- name = "jgit_lfs",
+ name = "jgit-lfs",
artifact = "org.eclipse.jgit:org.eclipse.jgit.lfs:" + JGIT_VERSION,
sha1 = "b716ddad524bf9b8f75475e232d803345df21423",
repository = REPO,
@@ -29,7 +29,7 @@
)
maven_jar(
- name = "jgit_lfs_server",
+ name = "jgit-lfs-server",
artifact = "org.eclipse.jgit:org.eclipse.jgit.lfs.server:" + JGIT_VERSION,
sha1 = "2d69c6ca1349c67415a9371c6ff103e90565c9de",
repository = REPO,
