flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

all: bump Animal-sniffer-annotation to 1.18 (#6488)

This commit is contained in:
Tomo Suzuki 2019-12-05 16:15:59 -05:00 committed by Jihun Cho
parent 9c2501f146
commit 80699f8be9
5 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/build.gradle
View File

@ -16,11 +16,9 @@ dependencies {
libraries.jsr305, libraries.jsr305,
libraries.animalsniffer_annotations libraries.animalsniffer_annotations
compile (libraries.guava) { 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' 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' 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' exclude group: 'org.codehaus.mojo', module: 'animal-sniffer-annotations'
} }

2
build.gradle
View File

@ -112,7 +112,7 @@ subprojects {
libraries = [ libraries = [
android_annotations: "com.google.android:annotations:4.1.1.4", 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", errorprone: "com.google.errorprone:error_prone_annotations:2.3.3",
gson: "com.google.code.gson:gson:2.8.6", gson: "com.google.code.gson:gson:2.8.6",
guava: "com.google.guava:guava:${guavaVersion}", guava: "com.google.guava:guava:${guavaVersion}",

4
protobuf-lite/build.gradle
View File

@ -13,11 +13,9 @@ dependencies {
compile project(':grpc-api'), compile project(':grpc-api'),
libraries.protobuf_lite libraries.protobuf_lite
compile (libraries.guava) { 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' 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' 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' exclude group: 'org.codehaus.mojo', module: 'animal-sniffer-annotations'
} }

4
protobuf/build.gradle
View File

@ -13,11 +13,9 @@ dependencies {
compile project(':grpc-api'), compile project(':grpc-api'),
libraries.protobuf libraries.protobuf
compile (libraries.guava) { 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' 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' 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' exclude group: 'org.codehaus.mojo', module: 'animal-sniffer-annotations'
} }

4
repositories.bzl
View File

@ -473,8 +473,8 @@ def org_apache_commons_lang3():
def org_codehaus_mojo_animal_sniffer_annotations(): def org_codehaus_mojo_animal_sniffer_annotations():
jvm_maven_import_external( jvm_maven_import_external(
name = "org_codehaus_mojo_animal_sniffer_annotations", 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"], server_urls = ["http://central.maven.org/maven2"],
artifact_sha256 = "92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53", artifact_sha256 = "47f05852b48ee9baefef80fa3d8cea60efa4753c0013121dd7fe5eef2e5c729d",
licenses = ["notice"], # MIT licenses = ["notice"], # MIT
) )