Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
Make transitive starlark loads explicit
Remove explicit dependency on commons-codec
Make transitive starlark loads explicit
Change-Id: Id9788908fc00e96ea8cad07ed242c399e317e2b1
diff --git a/BUILD b/BUILD
index 47be91a..f4c8d63 100644
--- a/BUILD
+++ b/BUILD
@@ -10,8 +10,5 @@
"Gerrit-HttpModule: com.googlesource.gerrit.plugins.serviceuser.HttpModule",
"Gerrit-SshModule: com.googlesource.gerrit.plugins.serviceuser.SshModule",
],
- provided_deps = [
- "@commons-codec//jar:neverlink",
- ],
resources = glob(["src/main/**/*"]),
)
diff --git a/WORKSPACE b/WORKSPACE
index 42235ac..1fb4bd9 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -31,7 +31,3 @@
)
gerrit_gwt()
-
-load(":external_plugin_deps.bzl", "external_plugin_deps")
-
-external_plugin_deps(omit_commons_codec = False)
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
deleted file mode 100644
index 352d75f..0000000
--- a/external_plugin_deps.bzl
+++ /dev/null
@@ -1,9 +0,0 @@
-load("//tools/bzl:maven_jar.bzl", "maven_jar")
-
-def external_plugin_deps(omit_commons_codec = True):
- if not omit_commons_codec:
- maven_jar(
- name = "commons-codec",
- artifact = "commons-codec:commons-codec:1.4",
- sha1 = "4216af16d38465bbab0f3dff8efa14204f7a399a",
- )