Merge branch 'master' of https://github.com/mpoehler/java-docs-samples

Author: mpoehler

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] -->

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] -->

bigquery/cloud-client/pom.xml

@@ -15,7 +15,7 @@
 -->
 <project>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>come.example.bigquery</groupId>
+  <groupId>com.example.bigquery</groupId>
   <artifactId>bigquery-google-cloud-samples</artifactId>
   <packaging>jar</packaging>
 

datastore/cloud-client/pom.xml

@@ -15,7 +15,7 @@
 -->
 <project>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>come.example.datastore</groupId>
+  <groupId>com.example.datastore</groupId>
   <artifactId>datastore-google-cloud-samples</artifactId>
   <packaging>jar</packaging>
 

logging/cloud-client/pom.xml

@@ -15,7 +15,7 @@
 -->
 <project>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>come.example.logging</groupId>
+  <groupId>com.example.logging</groupId>
   <artifactId>logging-google-cloud-samples</artifactId>
   <packaging>jar</packaging>
 

pubsub/cloud-client/pom.xml

@@ -15,7 +15,7 @@
 -->
 <project>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>come.example.pubsub</groupId>
+  <groupId>com.example.pubsub</groupId>
   <artifactId>pubsub-google-cloud-samples</artifactId>
   <packaging>jar</packaging>
 

spanner/cloud-client/pom.xml

@@ -30,7 +30,7 @@ limitations under the License.
 -->
 <project>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>come.example.spanner</groupId>
+  <groupId>com.example.spanner</groupId>
   <artifactId>spanner-google-cloud-samples</artifactId>
   <packaging>jar</packaging>
 

storage/cloud-client/pom.xml

@@ -15,7 +15,7 @@
 -->
 <project>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>come.example.storage</groupId>
+  <groupId>com.example.storage</groupId>
   <artifactId>storage-google-cloud-samples</artifactId>
   <packaging>jar</packaging>