From dcc3b71f9708265099589c4165d338deb330c8ae Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Mon, 1 Jun 2020 10:38:48 -0400 Subject: [PATCH 1/8] udpate Guava to 29.0 --- build.gradle | 7 +++++-- repositories.bzl | 7 +++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index c699b7d595e..6e31feab4ec 100644 --- a/build.gradle +++ b/build.gradle @@ -50,7 +50,7 @@ subprojects { javaPluginPath = "$rootDir/compiler/build/exe/java_plugin/$protocPluginBaseName$exeSuffix" nettyVersion = '4.1.48.Final' - guavaVersion = '28.2-android' + guavaVersion = '29.0-android' googleauthVersion = '0.20.0' protobufVersion = '3.12.0' protocVersion = protobufVersion @@ -187,7 +187,7 @@ subprojects { // Jetty ALPN dependencies jetty_alpn_agent: 'org.mortbay.jetty.alpn:jetty-alpn-agent:2.0.9' ] - + // A util function to config guava dependency with transitive dependencies // properly resolved for the failOnVersionConflict strategy. guavaDependency = { configurationName -> @@ -312,6 +312,9 @@ subprojects { testCompile libraries.junit, libraries.mockito, libraries.truth + testImplementation (libraries.guava_testlib) { + exclude group: 'junit', module: 'junit' + } } compileTestJava { diff --git a/repositories.bzl b/repositories.bzl index 7e714c194ba..62c9279c5d2 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -19,7 +19,7 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [ "com.google.code.gson:gson:jar:2.8.6", "com.google.errorprone:error_prone_annotations:2.3.4", "com.google.guava:failureaccess:1.0.1", - "com.google.guava:guava:28.2-android", + "com.google.guava:guava:29.0-android", "com.google.j2objc:j2objc-annotations:1.3", "com.google.truth:truth:1.0.1", "com.squareup.okhttp:okhttp:2.7.4", @@ -236,14 +236,13 @@ def com_google_errorprone_error_prone_annotations(): def com_google_guava_guava(): jvm_maven_import_external( name = "com_google_guava_guava", - artifact = "com.google.guava:guava:28.2-android", + artifact = "com.google.guava:guava:29.0-android", server_urls = ["https://repo.maven.apache.org/maven2/"], - artifact_sha256 = "1faf214c94723ab9fbadfedd9af88ddc325faf669e68eab04688c3afcf59c037", + artifact_sha256 = "00ba22cb0e32610db7cf8ab4c20017c85d11788600734ff1d86995345eb5bc3b", licenses = ["notice"], # Apache 2.0 ) def com_google_guava_failureaccess(): - # Not needed until Guava 27.0, but including now to ease upgrading of users. See #5214 jvm_maven_import_external( name = "com_google_guava_failureaccess", artifact = "com.google.guava:failureaccess:1.0.1", From 5745d3332474a232c3ad5e62c75fd75f3d7905ca Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 3 Jun 2020 09:10:16 -0400 Subject: [PATCH 2/8] update deprecated method --- context/src/test/java/io/grpc/ContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/context/src/test/java/io/grpc/ContextTest.java b/context/src/test/java/io/grpc/ContextTest.java index bf078fcff92..5171d4839a9 100644 --- a/context/src/test/java/io/grpc/ContextTest.java +++ b/context/src/test/java/io/grpc/ContextTest.java @@ -17,6 +17,7 @@ package io.grpc; import static io.grpc.Context.cancellableAncestor; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsInstanceOf.instanceOf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -24,7 +25,6 @@ import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; From a95766d9568a55f9331c5d4ea9802db47308bf5e Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 3 Jun 2020 09:11:31 -0400 Subject: [PATCH 3/8] update deprecated method --- .../src/test/java/io/grpc/netty/GrpcHttp2HeadersUtilsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netty/src/test/java/io/grpc/netty/GrpcHttp2HeadersUtilsTest.java b/netty/src/test/java/io/grpc/netty/GrpcHttp2HeadersUtilsTest.java index 96d87a53789..ab01cad46c4 100644 --- a/netty/src/test/java/io/grpc/netty/GrpcHttp2HeadersUtilsTest.java +++ b/netty/src/test/java/io/grpc/netty/GrpcHttp2HeadersUtilsTest.java @@ -19,9 +19,9 @@ import static io.grpc.Metadata.BINARY_BYTE_MARSHALLER; import static io.grpc.internal.GrpcUtil.DEFAULT_MAX_HEADER_LIST_SIZE; import static io.netty.util.AsciiString.of; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import com.google.common.collect.Iterables; From 5991495a6b988c40f5ef290ef7aa0a622af5c930 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 3 Jun 2020 09:27:43 -0400 Subject: [PATCH 4/8] optimize imports --- .../src/test/java/io/grpc/netty/GrpcHttp2HeadersUtilsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netty/src/test/java/io/grpc/netty/GrpcHttp2HeadersUtilsTest.java b/netty/src/test/java/io/grpc/netty/GrpcHttp2HeadersUtilsTest.java index ab01cad46c4..9336035f897 100644 --- a/netty/src/test/java/io/grpc/netty/GrpcHttp2HeadersUtilsTest.java +++ b/netty/src/test/java/io/grpc/netty/GrpcHttp2HeadersUtilsTest.java @@ -19,8 +19,8 @@ import static io.grpc.Metadata.BINARY_BYTE_MARSHALLER; import static io.grpc.internal.GrpcUtil.DEFAULT_MAX_HEADER_LIST_SIZE; import static io.netty.util.AsciiString.of; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; From eea3cf74941842f346e2d4c4213045bae164b9b2 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 3 Jun 2020 12:45:46 -0400 Subject: [PATCH 5/8] upate syntax --- alts/build.gradle | 4 +++- api/build.gradle | 4 +++- build.gradle | 3 --- census/build.gradle | 1 - context/build.gradle | 4 +++- core/build.gradle | 4 +++- xds/build.gradle | 4 +++- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/alts/build.gradle b/alts/build.gradle index 60f8fe1ed23..bc58f739dcf 100644 --- a/alts/build.gradle +++ b/alts/build.gradle @@ -37,7 +37,9 @@ dependencies { testImplementation project(':grpc-testing'), project(':grpc-testing-proto'), libraries.guava, - libraries.guava_testlib, + libraries.guava_testlib { + exclude group: 'junit', module: 'junit' + }, libraries.junit, libraries.mockito, libraries.truth diff --git a/api/build.gradle b/api/build.gradle index 3eaab4894f4..df58d2b34bf 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -18,7 +18,9 @@ dependencies { testImplementation project(':grpc-context').sourceSets.test.output, project(':grpc-testing'), project(':grpc-grpclb'), - libraries.guava_testlib + libraries.guava_testlib { + exclude group: 'junit', module: 'junit' + } jmh project(':grpc-core') diff --git a/build.gradle b/build.gradle index 6e31feab4ec..330b8cdccf7 100644 --- a/build.gradle +++ b/build.gradle @@ -312,9 +312,6 @@ subprojects { testCompile libraries.junit, libraries.mockito, libraries.truth - testImplementation (libraries.guava_testlib) { - exclude group: 'junit', module: 'junit' - } } compileTestJava { diff --git a/census/build.gradle b/census/build.gradle index 7925262ce3c..af5445a218c 100644 --- a/census/build.gradle +++ b/census/build.gradle @@ -17,7 +17,6 @@ dependencies { project(':grpc-context').sourceSets.test.output, project(':grpc-core').sourceSets.test.output, project(':grpc-testing'), - libraries.guava_testlib, libraries.opencensus_impl } diff --git a/context/build.gradle b/context/build.gradle index 1028ad2c628..e05f0d34497 100644 --- a/context/build.gradle +++ b/context/build.gradle @@ -10,7 +10,9 @@ plugins { description = 'gRPC: Context' dependencies { - testImplementation libraries.jsr305, libraries.guava_testlib + testImplementation libraries.jsr305, libraries.guava_testlib { + exclude group: 'junit', module: 'junit' + } signature "org.codehaus.mojo.signature:java17:1.0@signature" signature "net.sf.androidscents.signature:android-api-level-14:4.0_r4@signature" } diff --git a/core/build.gradle b/core/build.gradle index 8ae917db506..e2fd4396f66 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -24,7 +24,9 @@ dependencies { project(':grpc-api').sourceSets.test.output, project(':grpc-testing'), project(':grpc-grpclb'), - libraries.guava_testlib + libraries.guava_testlib { + exclude group: 'junit', module: 'junit' + } testRuntimeOnly project(':grpc-census') diff --git a/xds/build.gradle b/xds/build.gradle index d86750929b2..95f46cfaa2c 100644 --- a/xds/build.gradle +++ b/xds/build.gradle @@ -48,7 +48,9 @@ dependencies { testImplementation project(':grpc-testing'), project(':grpc-testing-proto'), - libraries.guava_testlib, + libraries.guava_testlib { + exclude group: 'junit', module: 'junit' + }, libraries.netty_epoll shadow configurations.implementation.getDependencies().minus([nettyDependency]) From d0f2761f2155b2361ce38b9e15df3f6ce5361d2b Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 3 Jun 2020 12:51:24 -0400 Subject: [PATCH 6/8] update syntax --- alts/build.gradle | 7 ++++--- api/build.gradle | 7 +++---- context/build.gradle | 3 ++- core/build.gradle | 10 +++++----- xds/build.gradle | 8 ++++---- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/alts/build.gradle b/alts/build.gradle index bc58f739dcf..9a04f0dd090 100644 --- a/alts/build.gradle +++ b/alts/build.gradle @@ -37,12 +37,13 @@ dependencies { testImplementation project(':grpc-testing'), project(':grpc-testing-proto'), libraries.guava, - libraries.guava_testlib { - exclude group: 'junit', module: 'junit' - }, libraries.junit, libraries.mockito, libraries.truth + + testImplementation (libraries.guava_testlib) { + exclude group: 'junit', module: 'junit' + } testRuntimeOnly libraries.netty_tcnative, libraries.netty_epoll signature 'org.codehaus.mojo.signature:java17:1.0@signature' diff --git a/api/build.gradle b/api/build.gradle index df58d2b34bf..9297f9c48d9 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -18,10 +18,9 @@ dependencies { testImplementation project(':grpc-context').sourceSets.test.output, project(':grpc-testing'), project(':grpc-grpclb'), - libraries.guava_testlib { - exclude group: 'junit', module: 'junit' - } - + testImplementation (libraries.guava_testlib) { + exclude group: 'junit', module: 'junit' + } jmh project(':grpc-core') signature "org.codehaus.mojo.signature:java17:1.0@signature" diff --git a/context/build.gradle b/context/build.gradle index e05f0d34497..4512cc56f0a 100644 --- a/context/build.gradle +++ b/context/build.gradle @@ -10,7 +10,8 @@ plugins { description = 'gRPC: Context' dependencies { - testImplementation libraries.jsr305, libraries.guava_testlib { + testImplementation libraries.jsr305 + testImplementation (libraries.guava_testlib) { exclude group: 'junit', module: 'junit' } signature "org.codehaus.mojo.signature:java17:1.0@signature" diff --git a/core/build.gradle b/core/build.gradle index e2fd4396f66..ba20489f70c 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -23,11 +23,11 @@ dependencies { testImplementation project(':grpc-context').sourceSets.test.output, project(':grpc-api').sourceSets.test.output, project(':grpc-testing'), - project(':grpc-grpclb'), - libraries.guava_testlib { - exclude group: 'junit', module: 'junit' - } - + project(':grpc-grpclb') + testImplementation (libraries.guava_testlib) { + exclude group: 'junit', module: 'junit' + } + testRuntimeOnly project(':grpc-census') jmh project(':grpc-testing') diff --git a/xds/build.gradle b/xds/build.gradle index 95f46cfaa2c..ca6e44c7ab3 100644 --- a/xds/build.gradle +++ b/xds/build.gradle @@ -48,11 +48,11 @@ dependencies { testImplementation project(':grpc-testing'), project(':grpc-testing-proto'), - libraries.guava_testlib { - exclude group: 'junit', module: 'junit' - }, libraries.netty_epoll - + testImplementation (libraries.guava_testlib) { + exclude group: 'junit', module: 'junit' + } + shadow configurations.implementation.getDependencies().minus([nettyDependency]) shadow project(path: ':grpc-netty-shaded', configuration: 'shadow') From 6ed1be89627a36959c0366a81647031c4543705c Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 3 Jun 2020 14:05:39 -0400 Subject: [PATCH 7/8] remove comma --- api/build.gradle | 2 +- xds/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/build.gradle b/api/build.gradle index 9297f9c48d9..1574cdd8b4a 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -17,7 +17,7 @@ dependencies { testImplementation project(':grpc-context').sourceSets.test.output, project(':grpc-testing'), - project(':grpc-grpclb'), + project(':grpc-grpclb') testImplementation (libraries.guava_testlib) { exclude group: 'junit', module: 'junit' } diff --git a/xds/build.gradle b/xds/build.gradle index ca6e44c7ab3..a5f87bdb486 100644 --- a/xds/build.gradle +++ b/xds/build.gradle @@ -52,7 +52,7 @@ dependencies { testImplementation (libraries.guava_testlib) { exclude group: 'junit', module: 'junit' } - + shadow configurations.implementation.getDependencies().minus([nettyDependency]) shadow project(path: ':grpc-netty-shaded', configuration: 'shadow') From 13f776376b9b2cc75095aaed69a395857194930d Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 3 Jun 2020 14:08:17 -0400 Subject: [PATCH 8/8] remove comma --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 330b8cdccf7..1c24a4dd6e1 100644 --- a/build.gradle +++ b/build.gradle @@ -187,7 +187,7 @@ subprojects { // Jetty ALPN dependencies jetty_alpn_agent: 'org.mortbay.jetty.alpn:jetty-alpn-agent:2.0.9' ] - + // A util function to config guava dependency with transitive dependencies // properly resolved for the failOnVersionConflict strategy. guavaDependency = { configurationName ->