Merge branch 'master' into speech-fixwordtimeoffset

gguuss · web-flow · commit da0fc94e7c73 · 2017-08-01T16:53:40.000-07:00
diff --git a/flexible/pubsub/pom.xml b/flexible/pubsub/pom.xml
@@ -39,15 +39,15 @@
   </properties>
 
 <!-- FIXME(lesv) Temporary fix due to Datastore having the wrong version -->
-  <dependencyManagement>
+  <!--<dependencyManagement>
     <dependencies>
       <dependency>
           <groupId>io.grpc</groupId>
           <artifactId>grpc-core</artifactId>
           <version>1.2.0</version>
       </dependency>
     </dependencies>
-  </dependencyManagement>
+  </dependencyManagement>-->
 <!-- end of FIXME -->
 
   <dependencies>
