diff --git a/api/build.gradle b/api/build.gradle index affde080855..09361582df8 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -16,11 +16,9 @@ dependencies { libraries.jsr305, libraries.animalsniffer_annotations compile (libraries.guava) { - // prefer 2.3.3 from libraries instead of 2.1.3 + // prefer our own versions from libraries instead of Guava's dependency exclude group: 'com.google.errorprone', module: 'error_prone_annotations' - // prefer 3.0.2 from libraries instead of 3.0.1 exclude group: 'com.google.code.findbugs', module: 'jsr305' - // prefer 1.17 from libraries instead of 1.14 exclude group: 'org.codehaus.mojo', module: 'animal-sniffer-annotations' } diff --git a/build.gradle b/build.gradle index 4f605c838fe..a6d458fd1f7 100644 --- a/build.gradle +++ b/build.gradle @@ -117,7 +117,7 @@ subprojects { libraries = [ android_annotations: "com.google.android:annotations:4.1.1.4", - animalsniffer_annotations: "org.codehaus.mojo:animal-sniffer-annotations:1.17", + animalsniffer_annotations: "org.codehaus.mojo:animal-sniffer-annotations:1.18", errorprone: "com.google.errorprone:error_prone_annotations:2.3.3", gson: "com.google.code.gson:gson:2.8.5", guava: "com.google.guava:guava:${guavaVersion}", diff --git a/protobuf-lite/build.gradle b/protobuf-lite/build.gradle index a470c2da7c3..209153426ea 100644 --- a/protobuf-lite/build.gradle +++ b/protobuf-lite/build.gradle @@ -13,11 +13,9 @@ dependencies { compile project(':grpc-api'), libraries.protobuf_lite compile (libraries.guava) { - // prefer 2.3.3 from libraries instead of 2.1.3 + // prefer our own versions from libraries instead of Guava's dependency exclude group: 'com.google.errorprone', module: 'error_prone_annotations' - // prefer 3.0.2 from libraries instead of 3.0.1 exclude group: 'com.google.code.findbugs', module: 'jsr305' - // prefer 1.17 from libraries instead of 1.14 exclude group: 'org.codehaus.mojo', module: 'animal-sniffer-annotations' } diff --git a/protobuf/build.gradle b/protobuf/build.gradle index 04221aa7eb0..b622ef1c66e 100644 --- a/protobuf/build.gradle +++ b/protobuf/build.gradle @@ -13,11 +13,9 @@ dependencies { compile project(':grpc-api'), libraries.protobuf compile (libraries.guava) { - // prefer 2.3.2 from libraries instead of 2.1.3 + // prefer our own versions from libraries instead of Guava's dependency exclude group: 'com.google.errorprone', module: 'error_prone_annotations' - // prefer 3.0.2 from libraries instead of 3.0.1 exclude group: 'com.google.code.findbugs', module: 'jsr305' - // prefer 1.17 from libraries instead of 1.14 exclude group: 'org.codehaus.mojo', module: 'animal-sniffer-annotations' } diff --git a/repositories.bzl b/repositories.bzl index d3f3070d9f1..366da46443b 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -473,8 +473,8 @@ def org_apache_commons_lang3(): def org_codehaus_mojo_animal_sniffer_annotations(): jvm_maven_import_external( name = "org_codehaus_mojo_animal_sniffer_annotations", - artifact = "org.codehaus.mojo:animal-sniffer-annotations:1.17", + artifact = "org.codehaus.mojo:animal-sniffer-annotations:1.18", server_urls = ["http://central.maven.org/maven2"], - artifact_sha256 = "92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53", + artifact_sha256 = "47f05852b48ee9baefef80fa3d8cea60efa4753c0013121dd7fe5eef2e5c729d", licenses = ["notice"], # MIT )