opendev/gerrit
Code Issues Proposed changes

Merge "Exempt guava from LC review"

Browse Source
This commit is contained in:
Han-Wen Nienhuys
2020-11-26 10:41:45 +00:00
committed by Gerrit Code Review
parent 44316865ea d36c21b4b9
commit 6f298cfa74
5 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
WORKSPACE
View File

@@ -211,14 +211,6 @@ maven_jar(
sha1 = "f645ed69d595b24d4cf8b3fbb64cc505bede8829", 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" CAFFEINE_VERS = "2.8.5"
maven_jar( maven_jar(

2
java/com/google/gerrit/extensions/BUILD
View File

@@ -1,5 +1,5 @@
load("@rules_java//java:defs.bzl", "java_binary", "java_library") 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") load("//tools/bzl:javadoc.bzl", "java_doc")
_DOC_VERS = "5.5.0.201909110433-r" _DOC_VERS = "5.5.0.201909110433-r"

5
lib/guava.bzl
View File

@@ -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/"

1
lib/nongoogle_test.sh
View File

@@ -21,6 +21,7 @@ elasticsearch-rest-client
flogger flogger
flogger-log4j-backend flogger-log4j-backend
flogger-system-backend flogger-system-backend
guava
httpasyncclient httpasyncclient
httpcore-nio httpcore-nio
j2objc j2objc

10
tools/nongoogle.bzl
View File

@@ -1,5 +1,9 @@
load("//tools/bzl:maven_jar.bzl", "maven_jar") 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(): def declare_nongoogle_deps():
"""loads dependencies that are not used at Google. """loads dependencies that are not used at Google.
@@ -129,6 +133,12 @@ def declare_nongoogle_deps():
sha1 = "b66d3bedb14da604828a8693bb24fd78e36b0e9e", sha1 = "b66d3bedb14da604828a8693bb24fd78e36b0e9e",
) )
maven_jar(
name = "guava",
artifact = "com.google.guava:guava:" + GUAVA_VERSION,
sha1 = GUAVA_BIN_SHA1,
)
# Test-only dependencies below. # Test-only dependencies below.
maven_jar( maven_jar(