---

chingor13 · web-flow · commit 812a6c553a07 · 2019-06-07T14:02:06.000-07:00
yaml --- r: 28865 b: refs/heads/autosynth-dlp c: cce2138 h: refs/heads/master i: 28863: 814bd65
diff --git a/[refs] b/[refs]
@@ -103,7 +103,7 @@ refs/tags/v0.60.0: 4cd518d0612329f8a8e53484eef4cd1651e32855
 refs/tags/v0.61.0: e4b526656bb1bf5eefd0ee578b7405147821225e
 refs/tags/v0.62.0: bbede7385d48ba08f487bdd29ec10668ace96396
 refs/heads/0.60.0-alpha: 10939381ffe0b8da32db4fe3087c86e3aa7f3e55
-refs/heads/autosynth-dlp: 23347a7be4c2c8bed7d465dd4f58be48eafb8cfb
+refs/heads/autosynth-dlp: cce213877554f6a4a554249d118f1952eb8a8d23
 refs/heads/autosynth-logging: eca54b98c8cf82050bbdfc5c19139673dff9e5b8
 refs/heads/dupes: 3478c5d81fd242d0e985656645a679420a2060c2
 refs/tags/v0.63.0: 94f19b71d40f46b36120e7b9d78a1a3d41bfcbd6
diff --git a/branches/autosynth-dlp/google-cloud-util/google-cloud-compat-checker/pom.xml b/branches/autosynth-dlp/google-cloud-util/google-cloud-compat-checker/pom.xml
@@ -16,12 +16,15 @@
   </parent>
   <properties>
     <site.installationModule>google-cloud-compat-checker</site.installationModule>
+    <grpc.version>1.21.0</grpc.version>
+    <!-- We are currently using the *-android version to support JDK7. -->
+    <guava.version>27.1-android</guava.version>
   </properties>
   <dependencies>
     <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
-      <version>2.0.7.Final</version>
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-netty-shaded</artifactId>
+      <version>${grpc.version}</version>
     </dependency>
     <dependency>
       <!-- It may look weird to have a compile dependency on a plugin,
@@ -38,13 +41,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <!-- We are currently using the *-android version to support JDK7. -->
-      <version>26.0-android</version>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-handler</artifactId>
-      <version>4.1.36.Final</version>
+      <version>${guava.version}</version>
     </dependency>
   </dependencies>
   <dependencyManagement>
diff --git a/branches/autosynth-dlp/google-cloud-util/google-cloud-compat-checker/src/main/java/com/google/cloud/compatchecker/GoogleCloudCompatChecker.java b/branches/autosynth-dlp/google-cloud-util/google-cloud-compat-checker/src/main/java/com/google/cloud/compatchecker/GoogleCloudCompatChecker.java
@@ -17,7 +17,7 @@
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
-import io.netty.handler.ssl.OpenSsl;
+import io.grpc.netty.shaded.io.netty.handler.ssl.OpenSsl;
 import java.util.List;
 import java.util.Properties;
 import java.util.Set;
