diff options
| author | Han-Wen Nienhuys <hanwen@google.com> | 2020-05-05 16:00:22 +0200 |
|---|---|---|
| committer | David Pursehouse <dpursehouse@digital.ai> | 2020-06-03 09:24:48 +0900 |
| commit | 306fd66fec6ecda0d91e82c41be4860a0ad1eb75 (patch) | |
| tree | e5f332b2e0f5bb7f055da66ebb0f878506f89342 | |
| parent | 96f071bed7829cb174e57c40e97cdf96fdc10c36 (diff) | |
Move Flogger to nongoogle.bzl
Gerrit is linked against the canonical source directly inside Google, so there
is no version skew concern.
Change-Id: Ifae82a75700bf15e48a04476d7e76c2a1e6b8a71
(cherry picked from commit 2d9f77f745353bb6dabd08ac129d09f9e1281ec7)
| -rw-r--r-- | WORKSPACE | 20 | ||||
| -rwxr-xr-x | lib/nongoogle_test.sh | 3 | ||||
| -rw-r--r-- | tools/nongoogle.bzl | 23 |
3 files changed, 26 insertions, 20 deletions
@@ -172,26 +172,6 @@ maven_jar( sha1 = "94ad16d728b374d65bd897625f3fbb3da223a2b6", ) -FLOGGER_VERS = "0.4" - -maven_jar( - name = "flogger", - artifact = "com.google.flogger:flogger:" + FLOGGER_VERS, - sha1 = "9c8863dcc913b56291c0c88e6d4ca9715b43df98", -) - -maven_jar( - name = "flogger-log4j-backend", - artifact = "com.google.flogger:flogger-log4j-backend:" + FLOGGER_VERS, - sha1 = "17aa5e31daa1354187e14b6978597d630391c028", -) - -maven_jar( - name = "flogger-system-backend", - artifact = "com.google.flogger:flogger-system-backend:" + FLOGGER_VERS, - sha1 = "287b569d76abcd82f9de87fe41829fbc7ebd8ac9", -) - maven_jar( name = "gson", artifact = "com.google.code.gson:gson:2.8.5", diff --git a/lib/nongoogle_test.sh b/lib/nongoogle_test.sh index 492c603a29..b04a454154 100755 --- a/lib/nongoogle_test.sh +++ b/lib/nongoogle_test.sh @@ -16,6 +16,9 @@ dropwizard-core duct-tape eddsa elasticsearch-rest-client +flogger +flogger-log4j-backend +flogger-system-backend httpasyncclient httpcore-nio j2objc diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl index 973eef816b..d4f67366e2 100644 --- a/tools/nongoogle.bzl +++ b/tools/nongoogle.bzl @@ -104,6 +104,29 @@ def declare_nongoogle_deps(): sha1 = "f84302e14648f9f63c0c73951054aeb2ff0b810a", ) + # Google internal dependencies: these are developed at Google, so there is + # no concern about version skew. + + FLOGGER_VERS = "0.4" + + maven_jar( + name = "flogger", + artifact = "com.google.flogger:flogger:" + FLOGGER_VERS, + sha1 = "9c8863dcc913b56291c0c88e6d4ca9715b43df98", + ) + + maven_jar( + name = "flogger-log4j-backend", + artifact = "com.google.flogger:flogger-log4j-backend:" + FLOGGER_VERS, + sha1 = "17aa5e31daa1354187e14b6978597d630391c028", + ) + + maven_jar( + name = "flogger-system-backend", + artifact = "com.google.flogger:flogger-system-backend:" + FLOGGER_VERS, + sha1 = "287b569d76abcd82f9de87fe41829fbc7ebd8ac9", + ) + # Test-only dependencies below. maven_jar( |