---

chingor13 · web-flow · commit 2f8fce2598e6 · 2019-06-07T14:02:06.000-07:00
yaml --- r: 32187 b: refs/heads/autosynth-dialogflow c: cce2138 h: refs/heads/master i: 32185: 3f155c6 32183: 377040c
diff --git a/[refs] b/[refs]
@@ -128,7 +128,7 @@ refs/heads/autosynth-bigtable: 2a6af7e2959fd79c99b8ca5d773f29a6434b546d
 refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
 refs/heads/autosynth-containeranalysis: 18d210f81f17cf74864d0db2c29e834302f74f2a
 refs/heads/autosynth-datastore: f1efc3dc465174f41041acd56cf29badcec3e5bd
-refs/heads/autosynth-dialogflow: 23347a7be4c2c8bed7d465dd4f58be48eafb8cfb
+refs/heads/autosynth-dialogflow: cce213877554f6a4a554249d118f1952eb8a8d23
 refs/heads/autosynth-errorreporting: 3f176c20b55dfaaa8fc32f28d82b31784b93e636
 refs/heads/autosynth-firestore: 983c75e4fb1076502c8cac73ef0538bdb10884f3
 refs/heads/autosynth-iot: 4025d1804241e74d54950a324dc4f667aeaad4b3
diff --git a/branches/autosynth-dialogflow/google-cloud-util/google-cloud-compat-checker/pom.xml b/branches/autosynth-dialogflow/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-dialogflow/google-cloud-util/google-cloud-compat-checker/src/main/java/com/google/cloud/compatchecker/GoogleCloudCompatChecker.java b/branches/autosynth-dialogflow/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;
