Revving build to v37 of the API

forcedotcom · May 5, 2016 · 7bc39ad · 7bc39ad
1 parent 97635da
commit 7bc39ad
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.force</groupId>
   <artifactId>dataloader</artifactId>
   <packaging>jar</packaging>
-  <version>36.0.0</version>
+  <version>37.0.0</version>
   <name>Data Loader</name>
   <url>https://github.com/forcedotcom/dataloader</url>
   <organization>
@@ -13,7 +13,7 @@
   </organization>
 
   <properties>
-    <force.version>36.0.0</force.version>
+    <force.version>37.0.3</force.version>
     <build.year>2015</build.year>
     <java.compile.version>1.8</java.compile.version>
     <minJvmVersion>1.8.0</minJvmVersion>

diff --git a/src/main/java/com/salesforce/dataloader/client/PartnerClient.java b/src/main/java/com/salesforce/dataloader/client/PartnerClient.java
@@ -217,7 +217,7 @@ public boolean connect() throws ConnectionException {
     protected boolean connectPostLogin(ConnectorConfig cc) {
         if (getClient() == null) throw new IllegalStateException("Client should be logged in already");
 
-        getClient().setCallOptions(ClientBase.getClientName(this.config), null, false);
+        getClient().setCallOptions(ClientBase.getClientName(this.config), null);
         // query header
         int querySize;
         try {
@@ -480,7 +480,7 @@ private boolean login() throws ConnectionException, ApiFault {
         final ConnectorConfig cc = getLoginConnectorConfig();
         final PartnerConnection conn = Connector.newConnection(cc);
         // identify the client as dataloader
-        conn.setCallOptions(ClientBase.getClientName(this.config), null, false);
+        conn.setCallOptions(ClientBase.getClientName(this.config), null);
 
         String oauthAccessToken = config.getString(Config.OAUTH_ACCESSTOKEN);
         if (oauthAccessToken != null && oauthAccessToken.trim().length() > 0){

diff --git a/src/main/nsis/bin/encrypt.bat b/src/main/nsis/bin/encrypt.bat
@@ -1,7 +1,7 @@
 @echo off
 
 IF "%JAVA_HOME%" == "" (
-    for /f "tokens=*" %%i in ('dataloader-36.0.0-java-home.exe') do (
+    for /f "tokens=*" %%i in ('${pom.build.finalName}-java-home.exe') do (
         IF EXIST "%%i" (
             set JAVA_HOME=%%i
         ) ELSE (
@@ -16,7 +16,7 @@ IF "%JAVA_HOME%" == "" (
     IF NOT EXIST "%JAVA_HOME%" (
         echo We couldn't find the Java Runtime Environment ^(JRE^) in directory "%JAVA_HOME%". To run process.bat, set the JAVA_HOME environment variable to the directory where the JRE is installed.
     ) ELSE (
-        "%JAVA_HOME%\bin\java"  -cp ..\dataloader-36.0.0-uber.jar com.salesforce.dataloader.security.EncryptionUtil %*
+        "%JAVA_HOME%\bin\java"  -cp ..\${pom.build.finalName}-uber.jar com.salesforce.dataloader.security.EncryptionUtil %*
     )
 )
 

diff --git a/src/main/nsis/bin/process.bat b/src/main/nsis/bin/process.bat
@@ -26,7 +26,7 @@ if not [%2]==[] set PROCESS_OPTION=process.name=%2
 
 
 IF "%JAVA_HOME%" == "" (
-    for /f "tokens=*" %%i in ('dataloader-36.0.0-java-home.exe') do (
+    for /f "tokens=*" %%i in ('${pom.build.finalName}-java-home.exe') do (
         IF EXIST "%%i" (
             set JAVA_HOME=%%i
         ) ELSE (
@@ -41,7 +41,7 @@ IF "%JAVA_HOME%" == "" (
     IF NOT EXIST "%JAVA_HOME%" (
         echo We couldn't find the Java Runtime Environment ^(JRE^) in directory "%JAVA_HOME%". To run process.bat, set the JAVA_HOME environment variable to the directory where the JRE is installed.
     ) ELSE (
-        "%JAVA_HOME%\bin\java" -cp ..\dataloader-36.0.0-uber.jar -Dsalesforce.config.dir=%1 com.salesforce.dataloader.process.ProcessRunner %PROCESS_OPTION%
+        "%JAVA_HOME%\bin\java" -cp ..\${pom.build.finalName}-uber.jar -Dsalesforce.config.dir=%1 com.salesforce.dataloader.process.ProcessRunner %PROCESS_OPTION%
     )
 )
 

diff --git a/src/main/nsis/config.properties~ b/src/main/nsis/config.properties~
@@ -0,0 +1,5 @@
+#Loader Config
+#Thu Sep 10 09:37:47 PDT 2009
+sfdc.endpoint=https\://na1-blitz02.soma.salesforce.com
+[email protected]
+sfdc.password=test1234
diff --git a/src/test/java/com/salesforce/dataloader/TestBase.java b/src/test/java/com/salesforce/dataloader/TestBase.java
@@ -233,7 +233,7 @@ private PartnerConnection newConnection(ConnectorConfig bindingConfig, int retri
         try {
             PartnerConnection newBinding = Connector.newConnection(bindingConfig);
 
-            newBinding.setCallOptions(API_CLIENT_NAME, null, false);
+            newBinding.setCallOptions(API_CLIENT_NAME, null);
 
             logger.info("Logging in as " + bindingConfig.getUsername() + "/" + bindingConfig.getPassword() + " to URL: " + bindingConfig.getAuthEndpoint());
             if (bindingConfig.isManualLogin()) {

diff --git a/src/test/resources/test.properties~ b/src/test/resources/test.properties~
@@ -8,9 +8,9 @@ test.redirect=true
 
 ## user/org/passwd
 test.org=pint.com
-test.user.default=***REMOVED***
-test.user.restricted=***REMOVED***
-test.password=***REMOVED***L
+test.user.default=[email protected]
+test.user.restricted=[email protected]
+test.password=test1234L
 
 ## test logging level
 test.log.level=debug