summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@gmail.com>2022-01-14 20:35:04 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-01-14 20:35:04 +0000
commitab07a762c7ce9577e5a876be35567859ac9337f3 (patch)
treed72f781eadf2c780875c498cc751fc446f444587
parent53446c7977bd3d7872aa492342e199ea9d529216 (diff)
parent65a6b1afd089a22f175bf7efd7736d9cdef4644c (diff)
Merge "Update from log4j:log4j:1.2.17 to ch.qos.reload4j:reload4j:1.2.18.0" into stable-3.3
-rw-r--r--WORKSPACE6
-rwxr-xr-xlib/nongoogle_test.sh1
-rw-r--r--tools/nongoogle.bzl6
3 files changed, 7 insertions, 6 deletions
diff --git a/WORKSPACE b/WORKSPACE
index d0f7561ced..bba5818ca9 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -255,12 +255,6 @@ maven_jar(
)
maven_jar(
- name = "log4j",
- artifact = "log4j:log4j:1.2.17",
- sha1 = "5af35056b4d257e4b64b9e8069c0746e8b08629f",
-)
-
-maven_jar(
name = "json-smart",
artifact = "net.minidev:json-smart:1.1.1",
sha1 = "24a2f903d25e004de30ac602c5b47f2d4e420a59",
diff --git a/lib/nongoogle_test.sh b/lib/nongoogle_test.sh
index 57afb1b612..dc980c23d8 100755
--- a/lib/nongoogle_test.sh
+++ b/lib/nongoogle_test.sh
@@ -32,6 +32,7 @@ jackson-annotations
jackson-core
jna
jruby
+log4j
mina-core
nekohtml
objenesis
diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl
index b5bcb6f5d4..394cf0e678 100644
--- a/tools/nongoogle.bzl
+++ b/tools/nongoogle.bzl
@@ -10,6 +10,12 @@ def declare_nongoogle_deps():
"""
maven_jar(
+ name = "log4j",
+ artifact = "ch.qos.reload4j:reload4j:1.2.18.0",
+ sha1 = "03b2b708403ab00eb0678bffdbbd567070bbdfab",
+ )
+
+ maven_jar(
name = "j2objc",
artifact = "com.google.j2objc:j2objc-annotations:1.1",
sha1 = "ed28ded51a8b1c6b112568def5f4b455e6809019",