Exempt guava from LC review Guava is exported from Google's internal VC directly, so Gerrit is always compliant with recent releases. Change-Id: I65ed234d0e445122c32d1e8a56d174098ec7a5b4
diff --git a/WORKSPACE b/WORKSPACE index fff9235..01decd5 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -211,14 +211,6 @@ sha1 = "f645ed69d595b24d4cf8b3fbb64cc505bede8829", ) -load("//lib:guava.bzl", "GUAVA_BIN_SHA1", "GUAVA_VERSION") - -maven_jar( - name = "guava", - artifact = "com.google.guava:guava:" + GUAVA_VERSION, - sha1 = GUAVA_BIN_SHA1, -) - CAFFEINE_VERS = "2.8.5" maven_jar(
diff --git a/java/com/google/gerrit/extensions/BUILD b/java/com/google/gerrit/extensions/BUILD index da5dc8b..21949f7 100644 --- a/java/com/google/gerrit/extensions/BUILD +++ b/java/com/google/gerrit/extensions/BUILD
@@ -1,5 +1,5 @@ load("@rules_java//java:defs.bzl", "java_binary", "java_library") -load("//lib:guava.bzl", "GUAVA_DOC_URL") +load("//tools:nongoogle.bzl", "GUAVA_DOC_URL") load("//tools/bzl:javadoc.bzl", "java_doc") _DOC_VERS = "5.5.0.201909110433-r"
diff --git a/lib/guava.bzl b/lib/guava.bzl deleted file mode 100644 index 4de39cb..0000000 --- a/lib/guava.bzl +++ /dev/null
@@ -1,5 +0,0 @@ -GUAVA_VERSION = "29.0-jre" - -GUAVA_BIN_SHA1 = "801142b4c3d0f0770dd29abea50906cacfddd447" - -GUAVA_DOC_URL = "https://google.github.io/guava/releases/" + GUAVA_VERSION + "/api/docs/"
diff --git a/lib/nongoogle_test.sh b/lib/nongoogle_test.sh index 8369024..df8ee66 100755 --- a/lib/nongoogle_test.sh +++ b/lib/nongoogle_test.sh
@@ -21,6 +21,7 @@ flogger flogger-log4j-backend flogger-system-backend +guava httpasyncclient httpcore-nio j2objc
diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl index 459143d..4c65588 100644 --- a/tools/nongoogle.bzl +++ b/tools/nongoogle.bzl
@@ -1,5 +1,9 @@ load("//tools/bzl:maven_jar.bzl", "maven_jar") +GUAVA_VERSION = "29.0-jre" +GUAVA_BIN_SHA1 = "801142b4c3d0f0770dd29abea50906cacfddd447" +GUAVA_DOC_URL = "https://google.github.io/guava/releases/" + GUAVA_VERSION + "/api/docs/" + def declare_nongoogle_deps(): """loads dependencies that are not used at Google. @@ -129,6 +133,12 @@ sha1 = "b66d3bedb14da604828a8693bb24fd78e36b0e9e", ) + maven_jar( + name = "guava", + artifact = "com.google.guava:guava:" + GUAVA_VERSION, + sha1 = GUAVA_BIN_SHA1, + ) + # Test-only dependencies below. maven_jar(