Skip to content

Commit 5826adf

Browse files
chingor13chingor13
authored
Update core dependencies (#6115)
* update gax to 1.48.0 * update google-auth-library to 0.17.0 * update grpc to 1.23.0 and import grpc-bom * cleanup guava versions to 28.0-android * update protobuf to 3.9.1 and use bom * update opencensus to 0.23.0 * update autovalue to 1.6.5 * latest autovalue is 1.6.6 * enable runningSpanStore to capture spans for testing * lint * cannot upgrade autovalue right now * try profiles for autovalue compatibility * exclusion to fix enforcer * undo exclusion, try via profile
1 parent 3909ebd commit 5826adf

7 files changed

Lines changed: 78 additions & 70 deletions

File tree

‎google-api-grpc/pom.xml‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1616
<project.javadoc.protobufBaseURL>https://googleapis.dev/java/google-api-grpc/latest</project.javadoc.protobufBaseURL>
17+
<grpc.version>1.23.0</grpc.version>
1718
</properties>
1819
<developers>
1920
<developer>
@@ -101,22 +102,19 @@
101102
<dependencyManagement>
102103
<dependencies>
103104
<!-- Common dependencies -->
104-
<dependency>
105-
<groupId>com.google.protobuf</groupId>
106-
<artifactId>protobuf-java</artifactId>
107-
<version>3.7.1</version>
108-
</dependency>
109105
<dependency>
110106
<groupId>io.grpc</groupId>
111-
<artifactId>grpc-stub</artifactId>
112-
<version>1.23.0</version>
113-
<scope>compile</scope>
107+
<artifactId>grpc-bom</artifactId>
108+
<version>${grpc.version}</version>
109+
<type>pom</type>
110+
<scope>import</scope>
114111
</dependency>
115112
<dependency>
116-
<groupId>io.grpc</groupId>
117-
<artifactId>grpc-protobuf</artifactId>
118-
<version>1.23.0</version>
119-
<scope>compile</scope>
113+
<groupId>com.google.protobuf</groupId>
114+
<artifactId>protobuf-bom</artifactId>
115+
<version>3.9.1</version>
116+
<type>pom</type>
117+
<scope>import</scope>
120118
</dependency>
121119
<dependency>
122120
<groupId>com.google.api</groupId>

‎google-cloud-bom/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
<dependency>
169169
<groupId>com.google.api</groupId>
170170
<artifactId>gax-bom</artifactId>
171-
<version>1.47.1</version>
171+
<version>1.48.0</version>
172172
<type>pom</type>
173173
<scope>import</scope>
174174
</dependency>

‎google-cloud-clients/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import java.util.Collection;
4444
import java.util.List;
4545
import java.util.concurrent.TimeUnit;
46+
import org.junit.BeforeClass;
4647
import org.junit.Test;
4748

4849
/** Tests for {@link OpenCensusUtil}. */
@@ -53,6 +54,11 @@ public class OpenCensusUtilTest {
5354
private static final TagValue TEST_TAG_VAL = TagValue.create("TEST_TAG_VAL");
5455
private static final String TEST_PARENT_LINK_NAME = "TEST_PARENT_LINK";
5556

57+
@BeforeClass
58+
public static void configureOpenCensus() {
59+
Tracing.getExportComponent().getRunningSpanStore().setMaxNumberOfSpans(5);
60+
}
61+
5662
// Verifies that trace contexts propagated as an attribute are set as the parent link in the
5763
// message receiver and that the tag context is not change (for now).
5864
@Test
@@ -148,7 +154,7 @@ private void assertSpanCount(int expected) {
148154
}
149155
Thread.yield();
150156
if (watch.elapsed(TimeUnit.SECONDS) >= 5) {
151-
fail();
157+
fail("failed to get spans in 5 seconds");
152158
}
153159
}
154160
}

‎google-cloud-clients/pom.xml‎

Lines changed: 57 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -158,15 +158,15 @@
158158
<!-- make sure to keep gax version in sync with google-cloud-bom -->
159159
<gax.version>1.47.1</gax.version>
160160
<api.common.java.version>1.8.1</api.common.java.version>
161-
<google.auth.version>0.16.2</google.auth.version>
162161
<grpc.version>1.23.0</grpc.version>
162+
<google.auth.version>0.17.0</google.auth.version>
163163
<!-- We are currently using the *-android version to support JDK7. -->
164164
<guava.version>28.0-android</guava.version>
165165
<http-client-bom.version>1.31.0</http-client-bom.version>
166166
<oauth-client.version>1.30.1</oauth-client.version>
167167
<protobuf.version>3.9.1</protobuf.version>
168168
<!-- make sure to keep opencensus version in sync with grpc -->
169-
<opencensus.version>0.21.0</opencensus.version>
169+
<opencensus.version>0.23.0</opencensus.version>
170170
<!-- make sure to keep version in sync with google-http-client -->
171171
<apache.httpclient.version>4.5.5</apache.httpclient.version>
172172
<!-- test dependency versions -->
@@ -211,6 +211,21 @@
211211
<type>pom</type>
212212
<scope>import</scope>
213213
</dependency>
214+
<dependency>
215+
<groupId>io.grpc</groupId>
216+
<artifactId>grpc-bom</artifactId>
217+
<version>${grpc.version}</version>
218+
<type>pom</type>
219+
<scope>import</scope>
220+
</dependency>
221+
<dependency>
222+
<groupId>com.google.protobuf</groupId>
223+
<artifactId>protobuf-bom</artifactId>
224+
<version>${protobuf.version}</version>
225+
<type>pom</type>
226+
<scope>import</scope>
227+
</dependency>
228+
214229
<dependency>
215230
<groupId>com.google.apis</groupId>
216231
<artifactId>google-api-services-bigquery</artifactId>
@@ -285,61 +300,12 @@
285300
<artifactId>json</artifactId>
286301
<version>20180813</version>
287302
</dependency>
288-
<dependency>
289-
<groupId>io.grpc</groupId>
290-
<artifactId>grpc-core</artifactId>
291-
<version>${grpc.version}</version>
292-
</dependency>
293-
<dependency>
294-
<groupId>io.grpc</groupId>
295-
<artifactId>grpc-netty</artifactId>
296-
<version>${grpc.version}</version>
297-
</dependency>
298-
<dependency>
299-
<groupId>io.grpc</groupId>
300-
<artifactId>grpc-netty-shaded</artifactId>
301-
<version>${grpc.version}</version>
302-
</dependency>
303-
<dependency>
304-
<groupId>io.grpc</groupId>
305-
<artifactId>grpc-stub</artifactId>
306-
<version>${grpc.version}</version>
307-
</dependency>
308-
<dependency>
309-
<groupId>io.grpc</groupId>
310-
<artifactId>grpc-auth</artifactId>
311-
<version>${grpc.version}</version>
312-
</dependency>
313-
<dependency>
314-
<groupId>io.grpc</groupId>
315-
<artifactId>grpc-protobuf</artifactId>
316-
<version>${grpc.version}</version>
317-
</dependency>
318-
<dependency>
319-
<groupId>io.grpc</groupId>
320-
<artifactId>grpc-context</artifactId>
321-
<version>${grpc.version}</version>
322-
</dependency>
323-
<dependency>
324-
<groupId>io.grpc</groupId>
325-
<artifactId>grpc-testing</artifactId>
326-
<version>${grpc.version}</version>
327-
</dependency>
303+
328304
<dependency>
329305
<groupId>com.google.code.findbugs</groupId>
330306
<artifactId>jsr305</artifactId>
331307
<version>3.0.2</version>
332308
</dependency>
333-
<dependency>
334-
<groupId>com.google.protobuf</groupId>
335-
<artifactId>protobuf-java</artifactId>
336-
<version>${protobuf.version}</version>
337-
</dependency>
338-
<dependency>
339-
<groupId>com.google.protobuf</groupId>
340-
<artifactId>protobuf-java-util</artifactId>
341-
<version>${protobuf.version}</version>
342-
</dependency>
343309
<dependency>
344310
<groupId>com.google.guava</groupId>
345311
<artifactId>guava</artifactId>
@@ -348,7 +314,7 @@
348314
<dependency>
349315
<groupId>com.google.auto.value</groupId>
350316
<artifactId>auto-value</artifactId>
351-
<version>1.4</version>
317+
<version>${autovalue.version}</version>
352318
</dependency>
353319
<dependency>
354320
<groupId>io.opencensus</groupId>
@@ -952,6 +918,44 @@
952918
</build>
953919
</profile>
954920

921+
<profile>
922+
<id>autovalue-java7</id>
923+
<activation>
924+
<jdk>1.7</jdk>
925+
</activation>
926+
<properties>
927+
<autovalue.version>1.4</autovalue.version>
928+
</properties>
929+
<dependencyManagement>
930+
<dependencies>
931+
<dependency>
932+
<groupId>com.google.auto.value</groupId>
933+
<artifactId>auto-value-annotations</artifactId>
934+
<version>1.6.6</version>
935+
</dependency>
936+
</dependencies>
937+
</dependencyManagement>
938+
</profile>
939+
940+
<profile>
941+
<id>autovalue-java8</id>
942+
<activation>
943+
<jdk>[1.8,)</jdk>
944+
</activation>
945+
<properties>
946+
<autovalue.version>1.6.6</autovalue.version>
947+
</properties>
948+
<dependencyManagement>
949+
<dependencies>
950+
<dependency>
951+
<groupId>com.google.auto.value</groupId>
952+
<artifactId>auto-value-annotations</artifactId>
953+
<version>${autovalue.version}</version>
954+
</dependency>
955+
</dependencies>
956+
</dependencyManagement>
957+
</profile>
958+
955959
<profile>
956960
<!-- Only run checkstyle plugin on Java 8+ (checkstyle artifact only supports Java 8+) -->
957961
<id>checkstyle-tests</id>

‎google-cloud-testing/google-cloud-conformance-tests/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</parent>
1515

1616
<properties>
17-
<protobuf.version>3.7.1</protobuf.version>
17+
<protobuf.version>3.9.1</protobuf.version>
1818
</properties>
1919

2020
<dependencies>

‎google-cloud-testing/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<groupId>com.google.guava</groupId>
6060
<artifactId>guava-testlib</artifactId>
6161
<!-- We are currently using the *-android version to support JDK7. -->
62-
<version>26.0-android</version>
62+
<version>28.0-android</version>
6363
</dependency>
6464
<dependency>
6565
<groupId>junit</groupId>

‎google-cloud-util/google-cloud-compat-checker/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<site.installationModule>google-cloud-compat-checker</site.installationModule>
1919
<grpc.version>1.23.0</grpc.version>
2020
<!-- We are currently using the *-android version to support JDK7. -->
21-
<guava.version>27.1-android</guava.version>
21+
<guava.version>28.0-android</guava.version>
2222
</properties>
2323
<dependencies>
2424
<dependency>

0 commit comments

Comments
 (0)