Merge branch 'master' into speech-upgrade

gguuss · web-flow · commit 3371a79e9921 · 2017-07-18T23:30:41.000-04:00
diff --git a/appengine-java8/cloudsql/pom.xml b/appengine-java8/cloudsql/pom.xml
@@ -72,11 +72,10 @@
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
       <version>5.1.42</version>  <!-- v5.x.x is for production, v6.x.x EAP X DevAPI -->
-      <!--<version>6.0.6</version>-->
     </dependency>
     <dependency>
       <groupId>com.google.cloud.sql</groupId>
-      <artifactId>mysql-socket-factory</artifactId>
+      <artifactId>mysql-socket-factory</artifactId> <!-- mysql-socket-factory-connector-j-6 if using 6.x.x -->
       <version>1.0.3</version>
     </dependency>
     <!-- [END dependencies] -->
