Prepare for new point release.

jlmorton · Nov 12, 2018 · 8a312c1 · 8a312c1
1 parent 48636f6
commit 8a312c1
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.jlmorton</groupId>
     <artifactId>tableau</artifactId>
-    <version>1.2</version>
+    <version>1.2.1</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.language.version>1.8</java.language.version>

diff --git 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");
             }
 
         };