update data loader version in install files (#186)

forcedotcom · Jun 4, 2019 · 81d24e1 · 81d24e1
1 parent 1050a60
commit 81d24e1
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# Release Notes for Data Loader v45.0.0
+# Notes for Data Loader v45.0.0 and later
 
-Data Loader v45 is built with Zulu OpenJDK 11 and requires a 64-bit operating system. Download and install Zulu OpenJDK 11 before installing Data Loader.
+Data Loader v45 and later is built with Zulu OpenJDK 11 and requires a 64-bit operating system. Download and install Zulu OpenJDK 11 before installing Data Loader. See instructions further down to install via scripts.
 
 Data Loader v44 is the last version built with Oracle Java 8. Developers can check out code from the branch “DataloaderV44Release”. End users can download v44 or older from this project’s “releases” tab.
 

diff --git a/release/mac/dataloader.command b/release/mac/dataloader.command
@@ -6,7 +6,7 @@ echo "**            ___  ____ ___ ____   _    ____ ____ ___  ____ ____       **"
 echo "**            |  \ |__|  |  |__|   |    |  | |__| |  \ |___ |__/       **"
 echo "**            |__/ |  |  |  |  |   |___ |__| |  | |__/ |___ |  \       **"
 echo "**                                                                     **"
-echo "**  Data Loader vDATALOADER_SHORT_VERSION_PLACEHOLDER is a Salesforce supported Open Source project to   **"
+echo "**  Data Loader v46 is a Salesforce supported Open Source project to   **"
 echo "**  help you import data to and export data from your Salesforce org.  **"
 echo "**  It requires Zulu OpenJDK 11 to run.                                **"
 echo "**                                                                     **"
@@ -26,5 +26,5 @@ then
 else
     echo "$JAVA_HOME"
     cd DATALODER_WORK_DIRECTORY_PLACEHOLDER   #change to your own customized directory
-    java -XstartOnFirstThread -jar DATALOADER_UBER_JAR_NAME_PLACEHOLDER salesforce.config.dir=DATALODER_WORK_DIRECTORY_PLACEHOLDER/configs
+    java -XstartOnFirstThread -jar dataloader-46.0.0-uber.jar salesforce.config.dir=DATALODER_WORK_DIRECTORY_PLACEHOLDER/configs
 fi
diff --git a/release/mac/install.command b/release/mac/install.command
@@ -1,7 +1,7 @@
 #!/bin/bash
-DATALOADER_VERSION="45.0.0"
-DATALOADER_SHORT_VERSION="45"
-DATALOADER_UBER_JAR_NAME="dataloader-45.0.0-uber.jar"
+DATALOADER_VERSION="46.0.0"
+DATALOADER_SHORT_VERSION="46"
+DATALOADER_UBER_JAR_NAME="dataloader-46.0.0-uber.jar"
 
 echo ""
 echo "*************************************************************************"

diff --git a/release/win/bin/encrypt.bat b/release/win/bin/encrypt.bat
@@ -6,7 +6,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-45.0.0-uber.jar com.salesforce.dataloader.security.EncryptionUtil %*
+        "%JAVA_HOME%\bin\java"  -cp ..\dataloader-46.0.0-uber.jar com.salesforce.dataloader.security.EncryptionUtil %*
     )
 )
 

diff --git a/release/win/bin/process.bat b/release/win/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-45.0.0-java-home.exe') do (
+    for /f "tokens=*" %%i in ('dataloader-46.0.0-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-45.0.0-uber.jar -Dsalesforce.config.dir=%1 com.salesforce.dataloader.process.ProcessRunner %PROCESS_OPTION%
+        "%JAVA_HOME%\bin\java" -cp ..\dataloader-46.0.0-uber.jar -Dsalesforce.config.dir=%1 com.salesforce.dataloader.process.ProcessRunner %PROCESS_OPTION%
     )
 )
 

diff --git a/release/win/dataloader.bat b/release/win/dataloader.bat
@@ -7,7 +7,7 @@ echo **            ___  ____ ___ ____   _    ____ ____ ___  ____ ____       **
 echo **            ^|  \ ^|__^|  ^|  ^|__^|   ^|    ^|  ^| ^|__^| ^|  \ ^|___ ^|__/       **
 echo **            ^|__/ ^|  ^|  ^|  ^|  ^|   ^|___ ^|__^| ^|  ^| ^|__/ ^|___ ^|  \       **
 echo **                                                                     **
-echo **  Data Loader v45 is a Salesforce supported Open Source project to   **
+echo **  Data Loader v46 is a Salesforce supported Open Source project to   **
 echo **  help you import data to and export data from your Salesforce org.  **
 echo **  It requires Zulu OpenJDK 11.0.x to run.                            **
 echo **                                                                     **
@@ -31,7 +31,7 @@ echo.
     )
 
 :Run
-    "%ZULU_JAVA_HOME%\bin\java"  -jar dataloader-45.0.0-uber.jar salesforce.config.dir=configs
+    "%ZULU_JAVA_HOME%\bin\java"  -jar dataloader-46.0.0-uber.jar salesforce.config.dir=configs
 
 :Exit
     endlocal
diff --git a/release/win/install.bat b/release/win/install.bat
@@ -1,9 +1,9 @@
 @echo off
 setlocal
 
-set DATALOADER_VERSION=45.0.0
-set DATALOADER_SHORT_VERSION=45
-set DATALOADER_UBER_JAR_NAME=dataloader-45.0.0-uber.jar
+set DATALOADER_VERSION=46.0.0
+set DATALOADER_SHORT_VERSION=46
+set DATALOADER_UBER_JAR_NAME=dataloader-46.0.0-uber.jar
 
 echo.
 echo *************************************************************************