Skip to content

Commit 8f7de7e

Browse files
authored
---
yaml --- r: 33103 b: refs/heads/autosynth-kms c: cce2138 h: refs/heads/master i: 33101: 48b5496 33099: 3e11998 33095: 741aab9 33087: c880ee1
1 parent f22cc1f commit 8f7de7e

3 files changed

Lines changed: 9 additions & 12 deletions

File tree

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ refs/heads/autosynth-dialogflow: 73974cc32e5212aec0126472e0bc1442886fedaf
132132
refs/heads/autosynth-errorreporting: effe8001d110ad584187b30aafc473db0dd4a15f
133133
refs/heads/autosynth-firestore: e79eeb26930dfae4439424ad2fda5874eeca54c8
134134
refs/heads/autosynth-iot: 044be280805a59e06d09658688c9ee474a9815ad
135-
refs/heads/autosynth-kms: 23347a7be4c2c8bed7d465dd4f58be48eafb8cfb
135+
refs/heads/autosynth-kms: cce213877554f6a4a554249d118f1952eb8a8d23
136136
refs/heads/autosynth-language: e73905aa7672afa47240e65b25c087207f4594f9
137137
refs/heads/autosynth-os-login: 123ba209c5769d0ee067e0ce5848bec13b42a4f4
138138
refs/heads/autosynth-redis: 6bedce4d7c7c6ca6a22e83ad1780e08fdc565a9e

branches/autosynth-kms/google-cloud-util/google-cloud-compat-checker/pom.xml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,15 @@
1616
</parent>
1717
<properties>
1818
<site.installationModule>google-cloud-compat-checker</site.installationModule>
19+
<grpc.version>1.21.0</grpc.version>
20+
<!-- We are currently using the *-android version to support JDK7. -->
21+
<guava.version>27.1-android</guava.version>
1922
</properties>
2023
<dependencies>
2124
<dependency>
22-
<groupId>io.netty</groupId>
23-
<artifactId>netty-tcnative-boringssl-static</artifactId>
24-
<version>2.0.7.Final</version>
25+
<groupId>io.grpc</groupId>
26+
<artifactId>grpc-netty-shaded</artifactId>
27+
<version>${grpc.version}</version>
2528
</dependency>
2629
<dependency>
2730
<!-- It may look weird to have a compile dependency on a plugin,
@@ -38,13 +41,7 @@
3841
<dependency>
3942
<groupId>com.google.guava</groupId>
4043
<artifactId>guava</artifactId>
41-
<!-- We are currently using the *-android version to support JDK7. -->
42-
<version>26.0-android</version>
43-
</dependency>
44-
<dependency>
45-
<groupId>io.netty</groupId>
46-
<artifactId>netty-handler</artifactId>
47-
<version>4.1.36.Final</version>
44+
<version>${guava.version}</version>
4845
</dependency>
4946
</dependencies>
5047
<dependencyManagement>

branches/autosynth-kms/google-cloud-util/google-cloud-compat-checker/src/main/java/com/google/cloud/compatchecker/GoogleCloudCompatChecker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import com.google.common.collect.ImmutableSet;
1919
import com.google.common.collect.Lists;
20-
import io.netty.handler.ssl.OpenSsl;
20+
import io.grpc.netty.shaded.io.netty.handler.ssl.OpenSsl;
2121
import java.util.List;
2222
import java.util.Properties;
2323
import java.util.Set;

0 commit comments

Comments
 (0)