Merge stable-2.14 into stable-2.15
* origin/stable-2.14:
Revert "Remove explicit dependency on commons-codec"
Change-Id: Iaa1dfe8c26c273fbcabc1b0730d479290fd7e0bd
diff --git a/BUILD b/BUILD
index f4c8d63..47be91a 100644
--- a/BUILD
+++ b/BUILD
@@ -10,5 +10,8 @@
"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 e8d7697..fd1fdd2 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -31,3 +31,7 @@
)
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
new file mode 100644
index 0000000..352d75f
--- /dev/null
+++ b/external_plugin_deps.bzl
@@ -0,0 +1,9 @@
+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",
+ )