Skip to content

Update core dependencies #6115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chingor13 merged 15 commits into from
Aug 22, 2019
Merged

Update core dependencies #6115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5b9b22a
update gax to 1.48.0
chingor13 Aug 21, 2019
24bcc70
update google-auth-library to 0.17.0
chingor13 Aug 21, 2019
cd2c5ec
update grpc to 1.23.0 and import grpc-bom
chingor13 Aug 21, 2019
de39e9f
cleanup guava versions to 28.0-android
chingor13 Aug 21, 2019
495a0c7
update protobuf to 3.9.1 and use bom
chingor13 Aug 21, 2019
de09374
update opencensus to 0.23.0
chingor13 Aug 21, 2019
40a3ce1
update autovalue to 1.6.5
chingor13 Aug 21, 2019
17bbde2
latest autovalue is 1.6.6
chingor13 Aug 21, 2019
ef67ae4
enable runningSpanStore to capture spans for testing
chingor13 Aug 21, 2019
391bc22
Merge branch 'master' into update-deps2
chingor13 Aug 21, 2019
3d572fa
lint
chingor13 Aug 21, 2019
3426821
cannot upgrade autovalue right now
chingor13 Aug 21, 2019
8e24848
try profiles for autovalue compatibility
chingor13 Aug 21, 2019
278c59d
exclusion to fix enforcer
chingor13 Aug 21, 2019
93931eb
undo exclusion, try via profile
chingor13 Aug 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions google-api-grpc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.javadoc.protobufBaseURL>https://googleapis.dev/java/google-api-grpc/latest</project.javadoc.protobufBaseURL>
<grpc.version>1.23.0</grpc.version>
</properties>
<developers>
<developer>
Expand Down Expand Up @@ -101,22 +102,19 @@
<dependencyManagement>
<dependencies>
<!-- Common dependencies -->
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.7.1</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>1.23.0</version>
<scope>compile</scope>
<artifactId>grpc-bom</artifactId>
<version>${grpc.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>1.23.0</version>
<scope>compile</scope>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId>
<version>3.9.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.api</groupId>
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
<dependency>
<groupId>com.google.api</groupId>
<artifactId>gax-bom</artifactId>
<version>1.47.1</version>
<version>1.48.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
8 changes: 7 additions & 1 deletion ...ents/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}. */
Expand All @@ -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
Expand Down Expand Up @@ -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");
}
}
}
Expand Down
110 changes: 57 additions & 53 deletions google-cloud-clients/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,15 @@
<!-- make sure to keep gax version in sync with google-cloud-bom -->
<gax.version>1.47.1</gax.version>
<api.common.java.version>1.8.1</api.common.java.version>
<google.auth.version>0.16.2</google.auth.version>
<grpc.version>1.23.0</grpc.version>
<google.auth.version>0.17.0</google.auth.version>
<!-- We are currently using the *-android version to support JDK7. -->
<guava.version>28.0-android</guava.version>
<http-client-bom.version>1.31.0</http-client-bom.version>
<oauth-client.version>1.30.1</oauth-client.version>
<protobuf.version>3.9.1</protobuf.version>
<!-- make sure to keep opencensus version in sync with grpc -->
<opencensus.version>0.21.0</opencensus.version>
<opencensus.version>0.23.0</opencensus.version>
<!-- make sure to keep version in sync with google-http-client -->
<apache.httpclient.version>4.5.5</apache.httpclient.version>
<!-- test dependency versions -->
Expand Down Expand Up @@ -211,6 +211,21 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>${grpc.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId>
<version>${protobuf.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-bigquery</artifactId>
Expand Down Expand Up @@ -285,61 +300,12 @@
<artifactId>json</artifactId>
<version>20180813</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty-shaded</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-auth</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-context</artifactId>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-testing</artifactId>
<version>${grpc.version}</version>
</dependency>

<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>${protobuf.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
Expand All @@ -348,7 +314,7 @@
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value</artifactId>
<version>1.4</version>
<version>${autovalue.version}</version>
</dependency>
<dependency>
<groupId>io.opencensus</groupId>
Expand Down Expand Up @@ -952,6 +918,44 @@
</build>
</profile>

<profile>
<id>autovalue-java7</id>
<activation>
<jdk>1.7</jdk>
</activation>
<properties>
<autovalue.version>1.4</autovalue.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value-annotations</artifactId>
<version>1.6.6</version>
</dependency>
</dependencies>
</dependencyManagement>
</profile>

<profile>
<id>autovalue-java8</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
<properties>
<autovalue.version>1.6.6</autovalue.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value-annotations</artifactId>
<version>${autovalue.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</profile>

<profile>
<!-- Only run checkstyle plugin on Java 8+ (checkstyle artifact only supports Java 8+) -->
<id>checkstyle-tests</id>
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-testing/google-cloud-conformance-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</parent>

<properties>
<protobuf.version>3.7.1</protobuf.version>
<protobuf.version>3.9.1</protobuf.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-testing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<groupId>com.google.guava</groupId>
<artifactId>guava-testlib</artifactId>
<!-- We are currently using the *-android version to support JDK7. -->
<version>26.0-android</version>
<version>28.0-android</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-util/google-cloud-compat-checker/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<site.installationModule>google-cloud-compat-checker</site.installationModule>
<grpc.version>1.23.0</grpc.version>
<!-- We are currently using the *-android version to support JDK7. -->
<guava.version>27.1-android</guava.version>
<guava.version>28.0-android</guava.version>
</properties>
<dependencies>
<dependency>
Expand Down