---

chingor13 · web-flow · commit 776edc324fde · 2019-06-07T14:02:06.000-07:00
yaml --- r: 35457 b: refs/heads/pubsub-ordering-keys c: cce2138 h: refs/heads/master i: 35455: f201fec
diff --git a/[refs] b/[refs]
@@ -155,7 +155,7 @@ refs/tags/v0.72.0: a7703f2593ba312c0b2dde6fdfd4f5c764bb55ac
 refs/tags/v0.73.0: 21241ea8be9439cc5764c4944cdce21d34ce4f9e
 refs/tags/v0.74.0: 9d1f733dbbf790de7b494418523b69c4a9a57638
 refs/heads/ignoretest: 23c412ae07af3d0ab1caa2d44d5bc5c0ccb8b31d
-refs/heads/pubsub-ordering-keys: 23347a7be4c2c8bed7d465dd4f58be48eafb8cfb
+refs/heads/pubsub-ordering-keys: cce213877554f6a4a554249d118f1952eb8a8d23
 refs/tags/v0.75.0: c3673089ae09a897c1b4cf7dfe167fe4f8ab32fb
 refs/tags/v0.76.0: 395b016826d3ddf9cb8b34919636df15a4dbd032
 refs/tags/v0.77.0: 28a85a77883ccf5d48f297fd0ef3b3dca6ce01f0
diff --git a/branches/pubsub-ordering-keys/google-cloud-util/google-cloud-compat-checker/pom.xml b/branches/pubsub-ordering-keys/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/pubsub-ordering-keys/google-cloud-util/google-cloud-compat-checker/src/main/java/com/google/cloud/compatchecker/GoogleCloudCompatChecker.java b/branches/pubsub-ordering-keys/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;
