diff --git a/google-api-grpc/pom.xml b/google-api-grpc/pom.xml index ad800bfc61c3..6a0fd7ceed81 100644 --- a/google-api-grpc/pom.xml +++ b/google-api-grpc/pom.xml @@ -14,6 +14,7 @@ UTF-8 UTF-8 https://googleapis.dev/java/google-api-grpc/latest + 1.23.0 @@ -101,22 +102,19 @@ - - com.google.protobuf - protobuf-java - 3.7.1 - io.grpc - grpc-stub - 1.23.0 - compile + grpc-bom + ${grpc.version} + pom + import - io.grpc - grpc-protobuf - 1.23.0 - compile + com.google.protobuf + protobuf-bom + 3.9.1 + pom + import com.google.api diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml index afdccc158cf2..84a4ed711b22 100644 --- a/google-cloud-bom/pom.xml +++ b/google-cloud-bom/pom.xml @@ -168,7 +168,7 @@ com.google.api gax-bom - 1.47.1 + 1.48.0 pom import diff --git a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java index d4230003907d..afa316220681 100644 --- a/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java +++ b/google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java @@ -43,6 +43,7 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.TimeUnit; +import org.junit.BeforeClass; import org.junit.Test; /** Tests for {@link OpenCensusUtil}. */ @@ -53,6 +54,11 @@ public class OpenCensusUtilTest { private static final TagValue TEST_TAG_VAL = TagValue.create("TEST_TAG_VAL"); private static final String TEST_PARENT_LINK_NAME = "TEST_PARENT_LINK"; + @BeforeClass + public static void configureOpenCensus() { + Tracing.getExportComponent().getRunningSpanStore().setMaxNumberOfSpans(5); + } + // Verifies that trace contexts propagated as an attribute are set as the parent link in the // message receiver and that the tag context is not change (for now). @Test @@ -148,7 +154,7 @@ private void assertSpanCount(int expected) { } Thread.yield(); if (watch.elapsed(TimeUnit.SECONDS) >= 5) { - fail(); + fail("failed to get spans in 5 seconds"); } } } diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml index 147c38081733..f20d7148e637 100644 --- a/google-cloud-clients/pom.xml +++ b/google-cloud-clients/pom.xml @@ -158,15 +158,15 @@ 1.47.1 1.8.1 - 0.16.2 1.23.0 + 0.17.0 28.0-android 1.31.0 1.30.1 3.9.1 - 0.21.0 + 0.23.0 4.5.5 @@ -211,6 +211,21 @@ pom import + + io.grpc + grpc-bom + ${grpc.version} + pom + import + + + com.google.protobuf + protobuf-bom + ${protobuf.version} + pom + import + + com.google.apis google-api-services-bigquery @@ -285,61 +300,12 @@ json 20180813 - - io.grpc - grpc-core - ${grpc.version} - - - io.grpc - grpc-netty - ${grpc.version} - - - io.grpc - grpc-netty-shaded - ${grpc.version} - - - io.grpc - grpc-stub - ${grpc.version} - - - io.grpc - grpc-auth - ${grpc.version} - - - io.grpc - grpc-protobuf - ${grpc.version} - - - io.grpc - grpc-context - ${grpc.version} - - - io.grpc - grpc-testing - ${grpc.version} - + com.google.code.findbugs jsr305 3.0.2 - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - com.google.protobuf - protobuf-java-util - ${protobuf.version} - com.google.guava guava @@ -348,7 +314,7 @@ com.google.auto.value auto-value - 1.4 + ${autovalue.version} io.opencensus @@ -952,6 +918,44 @@ + + autovalue-java7 + + 1.7 + + + 1.4 + + + + + com.google.auto.value + auto-value-annotations + 1.6.6 + + + + + + + autovalue-java8 + + [1.8,) + + + 1.6.6 + + + + + com.google.auto.value + auto-value-annotations + ${autovalue.version} + + + + + checkstyle-tests diff --git a/google-cloud-testing/google-cloud-conformance-tests/pom.xml b/google-cloud-testing/google-cloud-conformance-tests/pom.xml index 2e949c9bdd22..e78ec10905df 100644 --- a/google-cloud-testing/google-cloud-conformance-tests/pom.xml +++ b/google-cloud-testing/google-cloud-conformance-tests/pom.xml @@ -14,7 +14,7 @@ - 3.7.1 + 3.9.1 diff --git a/google-cloud-testing/pom.xml b/google-cloud-testing/pom.xml index 18067daee4e9..f87a4c449c8b 100644 --- a/google-cloud-testing/pom.xml +++ b/google-cloud-testing/pom.xml @@ -59,7 +59,7 @@ com.google.guava guava-testlib - 26.0-android + 28.0-android junit diff --git a/google-cloud-util/google-cloud-compat-checker/pom.xml b/google-cloud-util/google-cloud-compat-checker/pom.xml index b3b9dda2904f..e0d6fdfb6291 100644 --- a/google-cloud-util/google-cloud-compat-checker/pom.xml +++ b/google-cloud-util/google-cloud-compat-checker/pom.xml @@ -18,7 +18,7 @@ google-cloud-compat-checker 1.23.0 - 27.1-android + 28.0-android