diff --git a/Makefile b/Makefile index bf4bddb..354af5d 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ MKDIR_P = mkdir -p NAME = tableau-sdk-wrapper -VERSION = 1.2 +VERSION = 1.2.1 BUILD_DIR = ${NAME}-${VERSION} ARTIFACT = tableau-${VERSION}.jar ARCHIVE = ${NAME}-${VERSION}.zip diff --git a/README.md b/README.md index eb6d95e..39eeea2 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ The Tableau Extract API is not thread-safe when inserting a row to the extract, Included in the utility is a thin wrapper to publish an extract to Tableau. -The latest version is 1.2, which is [available here](https://github.com/jlmorton/tableau/releases/download/1.2/tableau-sdk-wrapper-1.2.zip). +The latest version is 1.2.1, which is [available here](https://github.com/jlmorton/tableau/releases/download/1.2/tableau-sdk-wrapper-1.2.zip). # Performance On my small dual core Macbook Pro, I see the following performance: @@ -49,7 +49,7 @@ Instead, there is a small shell script included in this repository, `bin/install The utility requires Java 8. # Installation -Download the [current release distribution](https://github.com/jlmorton/tableau/releases/download/1.2/tableau-sdk-wrapper-1.2.zip) and unzip. Run the `install_tableau_sdk.sh` to download the Tableau libraries. +Download the [current release distribution](https://github.com/jlmorton/tableau/releases/download/1.2.1/tableau-sdk-wrapper-1.2.1.zip) and unzip. Run the `install_tableau_sdk.sh` to download the Tableau libraries. # Building After installing the Tableau SDK, simply run `mvn install` diff --git a/bin/extract.sh b/bin/extract.sh index f7f8d14..587ce83 100755 --- a/bin/extract.sh +++ b/bin/extract.sh @@ -2,7 +2,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/.." LIB="$DIR/lib" MAX_MEMORY="2g" -JARFILE="$LIB/tableau-1.2.jar" +JARFILE="$LIB/tableau-1.2.1.jar" SDK_DIR="$LIB/tableausdk-linux64-10300.18.0510.1135" JAVA_SDK_DIR="$SDK_DIR/lib64/tableausdk/Java/" diff --git a/bin/publish.sh b/bin/publish.sh index fff1a38..879213f 100755 --- a/bin/publish.sh +++ b/bin/publish.sh @@ -1,7 +1,7 @@ #!/bin/bash BASE_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/.." LIB="$BASE_PATH/lib" -JARFILE="$LIB/tableau-1.2.jar" +JARFILE="$LIB/tableau-1.2.1.jar" SDK_DIR="$LIB/tableausdk-linux64-10300.18.0510.1135" JAVA_SDK_DIR="$SDK_DIR/lib64/tableausdk/Java/" diff --git a/pom.xml b/pom.xml index 8702acd..8f850e1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 net.jlmorton tableau - 1.2 + 1.2.1 UTF-8 1.8 diff --git a/src/main/java/net/jlmorton/tableau/CommandLinePropertySource.java b/src/main/java/net/jlmorton/tableau/CommandLinePropertySource.java index cbf700d..9452a9a 100644 --- a/src/main/java/net/jlmorton/tableau/CommandLinePropertySource.java +++ b/src/main/java/net/jlmorton/tableau/CommandLinePropertySource.java @@ -89,7 +89,7 @@ public boolean isPublish() { @Override public boolean isExtract() { - return commandLine.hasOption("extract"); + return commandLine.hasOption("extract") && commandLine.hasOption("file"); } };