From 7b7928ab72e54737a8b18a7d5c5f617c6b1bc130 Mon Sep 17 00:00:00 2001
From: Les Vogel <lesv@google.com>
Date: Mon, 29 May 2017 21:34:47 -0700
Subject: [PATCH] Use the socketFactory everywhere

1. No longer use the Google Connector/j
---
 appengine-java8/cloudsql/pom.xml                           | 7 ++++---
 .../cloudsql/src/main/webapp/WEB-INF/appengine-web.xml     | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/appengine-java8/cloudsql/pom.xml b/appengine-java8/cloudsql/pom.xml
index 0147051f3a3..a5c220858cd 100644
--- a/appengine-java8/cloudsql/pom.xml
+++ b/appengine-java8/cloudsql/pom.xml
@@ -69,14 +69,15 @@
     </dependency>
 
     <!-- [START dependencies] -->
-    <dependency> <!-- ONLY USED LOCALY -->
+    <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
-      <version>5.1.40</version>  <!-- v5.x.x is Java 7, v6.x.x is Java 8 -->
+      <version>5.1.40</version>  <!-- v5.x.x is for production, v6.x.x EAP X DevAPI and Java 8 -->
+      <!--<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 -->
       <version>1.0.2</version>
     </dependency>
     <!-- [END dependencies] -->
diff --git a/appengine-java8/cloudsql/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-java8/cloudsql/src/main/webapp/WEB-INF/appengine-web.xml
index f028552e364..af5c5995e03 100644
--- a/appengine-java8/cloudsql/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine-java8/cloudsql/src/main/webapp/WEB-INF/appengine-web.xml
@@ -16,10 +16,10 @@
   <threadsafe>true</threadsafe>
   <runtime>java8</runtime>
 
-  <use-google-connector-j>true</use-google-connector-j>
+  <!-- <use-google-connector-j>true</use-google-connector-j> NO LONGER REQUIRED -->
   <system-properties>
-    <property name="ae-cloudsql.cloudsql-database-url" value="jdbc:google:mysql://${INSTANCE_CONNECTION_NAME}/${database}?user=${user}&amp;password=${password}" />
-    <property name="ae-cloudsql.local-database-url" value="jdbc:mysql://google/${database}?cloudSqlInstance=${INSTANCE_CONNECTION_NAME}&amp;socketFactory=com.google.cloud.sql.mysql.SocketFactory&amp;user=${user}&amp;password=${password}&amp;useSSL=false" />
+    <property name="ae-cloudsql.cloudsql-database-url" value="jdbc:mysql://google/${database}?useSSL=false&amp;cloudSqlInstance=${INSTANCE_CONNECTION_NAME}&amp;socketFactory=com.google.cloud.sql.mysql.SocketFactory&amp;user=${user}&amp;password=${password}" />
+    <property name="ae-cloudsql.local-database-url" value="jdbc:mysql://google/${database}?useSSL=false&amp;cloudSqlInstance=${INSTANCE_CONNECTION_NAME}&amp;socketFactory=com.google.cloud.sql.mysql.SocketFactory&amp;user=${user}&amp;password=${password}" />
   </system-properties>
 </appengine-web-app>
 <!-- [END config] -->