diff options
| author | Edwin Kempin <ekempin@google.com> | 2022-03-16 10:58:48 +0100 |
|---|---|---|
| committer | Edwin Kempin <ekempin@google.com> | 2022-03-16 11:51:35 +0100 |
| commit | 00fe2a4019864cd27c6cf2946b982f45313651e0 (patch) | |
| tree | a2f2283ba4c10342d6b0807dd343abe948d9f5c9 | |
| parent | 03ba8b11c9f0d5c4a87a8bf58fb30e4270e37a54 (diff) | |
Move SLF4J to nongoogle.bzl
Gerrit core and all plugins used by Google migrated to Flogger so that
Gerrit at Google no longer depends on SLF4J. Hence the SLF4J version
doesn't need to match the SLF4J version that is used at Google.
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I40ff875a33aa628eef5f387e22768665188b434f
Release-Notes: skip
| -rw-r--r-- | WORKSPACE | 26 | ||||
| -rwxr-xr-x | lib/nongoogle_test.sh | 4 | ||||
| -rw-r--r-- | tools/nongoogle.bzl | 26 |
3 files changed, 30 insertions, 26 deletions
@@ -228,32 +228,6 @@ maven_jar( sha1 = "28c59f58f5adcc307604602e2aa89e2aca14c554", ) -SLF4J_VERS = "1.7.33" - -maven_jar( - name = "log-api", - artifact = "org.slf4j:slf4j-api:" + SLF4J_VERS, - sha1 = "d375aa1b98d34d5ddf73a3f19eaad66e98975b12", -) - -maven_jar( - name = "log-ext", - artifact = "org.slf4j:slf4j-ext:" + SLF4J_VERS, - sha1 = "00da03640ae1ad57f964dcaa542fb5d804dce8a6", -) - -maven_jar( - name = "impl-log4j", - artifact = "org.slf4j:slf4j-reload4j:" + SLF4J_VERS, - sha1 = "ddc89144bfb56781936120b2334a70869b68db6d", -) - -maven_jar( - name = "jcl-over-slf4j", - artifact = "org.slf4j:jcl-over-slf4j:" + SLF4J_VERS, - sha1 = "28c441128bc81b6d95cc2857ae5bb46ae5bf658b", -) - maven_jar( name = "json-smart", artifact = "net.minidev:json-smart:1.1.1", diff --git a/lib/nongoogle_test.sh b/lib/nongoogle_test.sh index dc980c23d8..13e81f749d 100755 --- a/lib/nongoogle_test.sh +++ b/lib/nongoogle_test.sh @@ -27,11 +27,15 @@ guice-library-no-aop guice-servlet httpasyncclient httpcore-nio +impl-log4j j2objc jackson-annotations jackson-core +jcl-over-slf4j jna jruby +log-api +log-ext log4j mina-core nekohtml diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl index 5ae1f4cec0..c68536e177 100644 --- a/tools/nongoogle.bzl +++ b/tools/nongoogle.bzl @@ -15,6 +15,32 @@ def declare_nongoogle_deps(): sha1 = "7075022a11e18c1ad230de5be074e0c691fed17b", ) + SLF4J_VERS = "1.7.33" + + maven_jar( + name = "log-api", + artifact = "org.slf4j:slf4j-api:" + SLF4J_VERS, + sha1 = "d375aa1b98d34d5ddf73a3f19eaad66e98975b12", + ) + + maven_jar( + name = "log-ext", + artifact = "org.slf4j:slf4j-ext:" + SLF4J_VERS, + sha1 = "00da03640ae1ad57f964dcaa542fb5d804dce8a6", + ) + + maven_jar( + name = "impl-log4j", + artifact = "org.slf4j:slf4j-reload4j:" + SLF4J_VERS, + sha1 = "ddc89144bfb56781936120b2334a70869b68db6d", + ) + + maven_jar( + name = "jcl-over-slf4j", + artifact = "org.slf4j:jcl-over-slf4j:" + SLF4J_VERS, + sha1 = "28c441128bc81b6d95cc2857ae5bb46ae5bf658b", + ) + maven_jar( name = "j2objc", artifact = "com.google.j2objc:j2objc-annotations:1.1", |