Merge branch '3.9' of https://github.com/JumpMind/symmetric-ds.git in…

…to 3.9
JumpMind · Oct 12, 2018 · 7f03f80 · 7f03f80
2 parents afa3730 + 2df19e5
commit 7f03f80
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/symmetric-android/src/main/java/org/jumpmind/symmetric/android/AndroidSymmetricEngine.java b/symmetric-android/src/main/java/org/jumpmind/symmetric/android/AndroidSymmetricEngine.java
@@ -26,7 +26,6 @@
 import java.util.Properties;
 
 import org.apache.commons.lang.NotImplementedException;
-import org.jumpmind.db.model.Table;
 import org.jumpmind.db.platform.IDatabasePlatform;
 import org.jumpmind.properties.TypedProperties;
 import org.jumpmind.security.SecurityServiceFactory.SecurityServiceType;
@@ -83,6 +82,7 @@ public AndroidSymmetricEngine(String registrationUrl, String externalId, String
         this.databaseHelper = databaseHelper;
         this.androidContext = androidContext;
         init();
+        this.symmetricDialect.setTargetPlatform(this.symmetricDialect.getPlatform());
     }
 
     @Override

diff --git a/...c-android/src/main/java/org/jumpmind/symmetric/android/AndroidTypedPropertiesFactory.java b/...c-android/src/main/java/org/jumpmind/symmetric/android/AndroidTypedPropertiesFactory.java
@@ -41,6 +41,8 @@ public AndroidTypedPropertiesFactory(String syncUrl, String externalId, String n
             // change the default settings to make sense for android
             properties.setProperty(ParameterConstants.STREAM_TO_FILE_ENABLED,
                     Boolean.FALSE.toString());
+            properties.setProperty(ParameterConstants.INITIAL_LOAD_USE_EXTRACT_JOB,
+                    Boolean.FALSE.toString());
             properties.put(ParameterConstants.REGISTRATION_URL, syncUrl);
             properties.put(ParameterConstants.EXTERNAL_ID, externalId);
             properties.put(ParameterConstants.NODE_GROUP_ID, nodeGroupId);

diff --git a/symmetric-assemble/common.gradle b/symmetric-assemble/common.gradle
@@ -234,7 +234,9 @@ subprojects { subproject ->
         // javax.resource needed by jaybird
         provided "org.apache.geronimo.specs:geronimo-j2ee-connector_1.6_spec:1.0"
         provided "com.datastax.cassandra:cassandra-driver-core:3.1.4"
-        provided "nl.cad:tps-parse:1.0.15-SNAPSHOT"
+        provided ("nl.cad:tps-parse:1.0.15-SNAPSHOT") {
+        	exclude group: 'commons-lang', module: 'commons-lang'
+        }
         provided "org.apache.kafka:kafka-clients:1.1.0"
         provided "org.apache.avro:avro:1.8.2"
 		provided "io.confluent:kafka-avro-serializer:3.2.1"