Skip to content

Commit

Permalink
Update Force WSC and Force Partner API version to 48 (#201)
Browse files Browse the repository at this point in the history
Co-authored-by: Jae Jang <[email protected]>
  • Loading branch information
jjangsfdc and jjang-sfdc authored Jan 27, 2020
1 parent 145ad92 commit 44cabef
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.force</groupId>
<artifactId>dataloader</artifactId>
<packaging>jar</packaging>
<version>47.0.0</version>
<version>48.0.0</version>
<name>Data Loader</name>
<url>https://github.com/forcedotcom/dataloader</url>
<organization>
Expand All @@ -13,8 +13,8 @@
</organization>

<properties>
<force.wsc.version>47.0.0</force.wsc.version>
<force.partner.api.version>47.0.0</force.partner.api.version>
<force.wsc.version>48.1.0</force.wsc.version>
<force.partner.api.version>48.1.0</force.partner.api.version>
<build.year>2019</build.year>
<java.compile.version>11</java.compile.version>
<minJvmVersion>1.11.0</minJvmVersion>
Expand Down
4 changes: 2 additions & 2 deletions release/mac/dataloader.command
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ echo "** ___ ____ ___ ____ _ ____ ____ ___ ____ ____ **"
echo "** | \ |__| | |__| | | | |__| | \ |___ |__/ **"
echo "** |__/ | | | | | |___ |__| | | |__/ |___ | \ **"
echo "** **"
echo "** Data Loader v47 is a Salesforce supported Open Source project to **"
echo "** Data Loader v48 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 "** **"
Expand All @@ -26,5 +26,5 @@ then
else
echo "$JAVA_HOME"
cd DATALODER_WORK_DIRECTORY_PLACEHOLDER #change to your own customized directory
java -XstartOnFirstThread -jar dataloader-47.0.0-uber.jar salesforce.config.dir=DATALODER_WORK_DIRECTORY_PLACEHOLDER/configs
java -XstartOnFirstThread -jar dataloader-48.0.0-uber.jar salesforce.config.dir=DATALODER_WORK_DIRECTORY_PLACEHOLDER/configs
fi
6 changes: 3 additions & 3 deletions release/mac/install.command
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
DATALOADER_VERSION="47.0.0"
DATALOADER_SHORT_VERSION="47"
DATALOADER_UBER_JAR_NAME="dataloader-47.0.0-uber.jar"
DATALOADER_VERSION="48.0.0"
DATALOADER_SHORT_VERSION="48"
DATALOADER_UBER_JAR_NAME="dataloader-48.0.0-uber.jar"

echo ""
echo "*************************************************************************"
Expand Down
2 changes: 1 addition & 1 deletion release/win/bin/encrypt.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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-47.0.0-uber.jar com.salesforce.dataloader.security.EncryptionUtil %*
"%JAVA_HOME%\bin\java" -cp ..\dataloader-48.0.0-uber.jar com.salesforce.dataloader.security.EncryptionUtil %*
)
)

Expand Down
4 changes: 2 additions & 2 deletions release/win/bin/process.bat
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if not [%2]==[] set PROCESS_OPTION=process.name=%2


IF "%JAVA_HOME%" == "" (
for /f "tokens=*" %%i in ('dataloader-47.0.0-java-home.exe') do (
for /f "tokens=*" %%i in ('dataloader-48.0.0-java-home.exe') do (
IF EXIST "%%i" (
set JAVA_HOME=%%i
) ELSE (
Expand All @@ -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-47.0.0-uber.jar -Dsalesforce.config.dir=%1 com.salesforce.dataloader.process.ProcessRunner %PROCESS_OPTION%
"%JAVA_HOME%\bin\java" -cp ..\dataloader-48.0.0-uber.jar -Dsalesforce.config.dir=%1 com.salesforce.dataloader.process.ProcessRunner %PROCESS_OPTION%
)
)

Expand Down
4 changes: 2 additions & 2 deletions release/win/dataloader.bat
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ echo ** ___ ____ ___ ____ _ ____ ____ ___ ____ ____ **
echo ** ^| \ ^|__^| ^| ^|__^| ^| ^| ^| ^|__^| ^| \ ^|___ ^|__/ **
echo ** ^|__/ ^| ^| ^| ^| ^| ^|___ ^|__^| ^| ^| ^|__/ ^|___ ^| \ **
echo ** **
echo ** Data Loader v47 is a Salesforce supported Open Source project to **
echo ** Data Loader v48 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 ** **
Expand All @@ -31,7 +31,7 @@ echo.
)

:Run
"%ZULU_JAVA_HOME%\bin\java" -jar dataloader-47.0.0-uber.jar salesforce.config.dir=configs
"%ZULU_JAVA_HOME%\bin\java" -jar dataloader-48.0.0-uber.jar salesforce.config.dir=configs

:Exit
endlocal
6 changes: 3 additions & 3 deletions release/win/install.bat
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@echo off
setlocal

set DATALOADER_VERSION=47.0.0
set DATALOADER_SHORT_VERSION=47
set DATALOADER_UBER_JAR_NAME=dataloader-47.0.0-uber.jar
set DATALOADER_VERSION=48.0.0
set DATALOADER_SHORT_VERSION=48
set DATALOADER_UBER_JAR_NAME=dataloader-48.0.0-uber.jar

echo.
echo *************************************************************************
Expand Down

0 comments on commit 44cabef

Please sign in to comment.