diff options
| author | Han-Wen Nienhuys <hanwen@google.com> | 2020-12-17 17:59:40 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2021-03-04 14:28:36 +0100 |
| commit | 4b4575127152581c4ba6261e42a28c0ca889cb82 (patch) | |
| tree | 003d43911417e2251f259369d2232986c2fbba8f | |
| parent | 2c7ff59e4b845b3b936a6d3387b1c994b59b7e3c (diff) | |
Move GUICE to nongoogle.bzl
GUICE is developed inside Google, so there is no version skew concern.
Change-Id: I1a58fceefced4ddb7d62a94b82b8db41dbb70e76
| -rw-r--r-- | WORKSPACE | 30 | ||||
| -rwxr-xr-x | lib/nongoogle_test.sh | 3 | ||||
| -rw-r--r-- | tools/nongoogle.bzl | 31 |
3 files changed, 34 insertions, 30 deletions
@@ -139,36 +139,6 @@ maven_jar( sha1 = "83cd2cd674a217ade95a4bb83a8a14f351f48bd0", ) -GUICE_VERS = "4.2.3" - -GUICE_LIBRARY_SHA256 = "5168f5e7383f978c1b4154ac777b78edd8ac214bb9f9afdb92921c8d156483d3" - -http_file( - name = "guice-library-no-aop", - canonical_id = "guice-library-no-aop-" + GUICE_VERS + ".jar-" + GUICE_LIBRARY_SHA256, - downloaded_file_path = "guice-library-no-aop.jar", - sha256 = GUICE_LIBRARY_SHA256, - urls = [ - "https://repo1.maven.org/maven2/com/google/inject/guice/" + - GUICE_VERS + - "/guice-" + - GUICE_VERS + - "-no_aop.jar", - ], -) - -maven_jar( - name = "guice-assistedinject", - artifact = "com.google.inject.extensions:guice-assistedinject:" + GUICE_VERS, - sha1 = "acbfddc556ee9496293ed1df250cc378f331d854", -) - -maven_jar( - name = "guice-servlet", - artifact = "com.google.inject.extensions:guice-servlet:" + GUICE_VERS, - sha1 = "8d6e7e35eac4fb5e7df19c55b3bc23fa51b10a11", -) - maven_jar( name = "javax_inject", artifact = "javax.inject:javax.inject:1", diff --git a/lib/nongoogle_test.sh b/lib/nongoogle_test.sh index 9ec19a3a2c..57afb1b612 100755 --- a/lib/nongoogle_test.sh +++ b/lib/nongoogle_test.sh @@ -22,6 +22,9 @@ elasticsearch-rest-client flogger flogger-log4j-backend flogger-system-backend +guice-assistedinject +guice-library-no-aop +guice-servlet httpasyncclient httpcore-nio j2objc diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl index 4b6c8ace9b..b5bcb6f5d4 100644 --- a/tools/nongoogle.bzl +++ b/tools/nongoogle.bzl @@ -1,4 +1,5 @@ load("//tools/bzl:maven_jar.bzl", "maven_jar") +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file") def declare_nongoogle_deps(): """loads dependencies that are not used at Google. @@ -136,6 +137,36 @@ def declare_nongoogle_deps(): sha1 = "b66d3bedb14da604828a8693bb24fd78e36b0e9e", ) + GUICE_VERS = "4.2.3" + + GUICE_LIBRARY_SHA256 = "5168f5e7383f978c1b4154ac777b78edd8ac214bb9f9afdb92921c8d156483d3" + + http_file( + name = "guice-library-no-aop", + canonical_id = "guice-library-no-aop-" + GUICE_VERS + ".jar-" + GUICE_LIBRARY_SHA256, + downloaded_file_path = "guice-library-no-aop.jar", + sha256 = GUICE_LIBRARY_SHA256, + urls = [ + "https://repo1.maven.org/maven2/com/google/inject/guice/" + + GUICE_VERS + + "/guice-" + + GUICE_VERS + + "-no_aop.jar", + ], + ) + + maven_jar( + name = "guice-assistedinject", + artifact = "com.google.inject.extensions:guice-assistedinject:" + GUICE_VERS, + sha1 = "acbfddc556ee9496293ed1df250cc378f331d854", + ) + + maven_jar( + name = "guice-servlet", + artifact = "com.google.inject.extensions:guice-servlet:" + GUICE_VERS, + sha1 = "8d6e7e35eac4fb5e7df19c55b3bc23fa51b10a11", + ) + # Test-only dependencies below. maven_jar( |