Merge 3.10 to 3.11

JumpMind · Jan 21, 2020 · 34c19f0 · 34c19f0
1 parent d4a37e9
commit 34c19f0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/ClientSymmetricEngine.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/ClientSymmetricEngine.java
@@ -24,6 +24,7 @@
 import static org.apache.commons.lang.StringUtils.isNotBlank;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.StringReader;
 import java.lang.reflect.Constructor;
 import java.nio.charset.Charset;
@@ -45,6 +46,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.jumpmind.db.platform.IDatabasePlatform;
 import org.jumpmind.db.platform.JdbcDatabasePlatformFactory;
+import org.jumpmind.db.platform.bigquery.BigQueryPlatform;
 import org.jumpmind.db.platform.cassandra.CassandraPlatform;
 import org.jumpmind.db.platform.generic.GenericJdbcDatabasePlatform;
 import org.jumpmind.db.platform.kafka.KafkaPlatform;
@@ -83,6 +85,11 @@
 import org.springframework.jndi.JndiObjectFactoryBean;
 import org.xml.sax.InputSource;
 
+import com.google.auth.oauth2.ServiceAccountCredentials;
+import com.google.cloud.bigquery.BigQuery;
+import com.google.cloud.bigquery.BigQueryOptions;
+import com.google.cloud.http.HttpTransportOptions;
+
 /**
  * Represents the client portion of a SymmetricDS engine. This class can be used
  * to embed SymmetricDS into another application.

diff --git a/symmetric-util/src/main/java/org/jumpmind/util/FormatUtils.java b/symmetric-util/src/main/java/org/jumpmind/util/FormatUtils.java
@@ -59,10 +59,6 @@ public final class FormatUtils {
     public static final FastDateFormat TIMESTAMP_FORMATTER = FastDateFormat
             .getInstance("yyyy-MM-dd HH:mm:ss.SSS");
 
-    public static final String[] TIMESTAMP_WITH_TIMEZONE_PATTERNS = {
-            "yyyy-MM-dd HH:mm:ss.n xxx"
-    };
-
     public static final FastDateFormat TIME_FORMATTER = FastDateFormat.getInstance("HH:mm:ss.SSS");
 
     /* special characters for wildcard triggers */