Better handling of failed downloads (#207)

Introduced a command line option "-f" for install-gremlin-server.sh that
forces re-downloading of the files and ignores the cache contents.

Rolled back to the original 1.2.1 version of the download plugin - looks
like the overwrite option does no behave as documented in 1.3.0.

Fixed minor issue with one of mkdir commands, the script was failing if
started for the second time.

Author: ngrigoriev

pom.xml

@@ -28,7 +28,7 @@
         <maven.failsafe.version>2.19.1</maven.failsafe.version>
         <maven.resources.plugin.version>2.7</maven.resources.plugin.version>
         <exec.maven.plugin.version>1.2</exec.maven.plugin.version>
-        <download.maven.plugin.version>1.3.0</download.maven.plugin.version>
+        <download.maven.plugin.version>1.2.1</download.maven.plugin.version>
         <slf4j.version>1.7.21</slf4j.version>
         <opencsv.version>3.8</opencsv.version>
         <metrics3.version>3.0.1</metrics3.version>
@@ -41,6 +41,8 @@
         <include.category></include.category>
         <exclude.category></exclude.category>
         <test.excluded.groups>org.janusgraph.testcategory.MemoryTests,org.janusgraph.testcategory.PerformanceTests,org.janusgraph.testcategory.BrittleTests,org.janusgraph.testcategory.OrderedKeyStoreTests,org.janusgraph.testcategory.SerialTests</test.excluded.groups>
+	<download.skip.cache>false</download.skip.cache>
+	<download.force.overwrite>false</download.force.overwrite>
     </properties>
     <developers>
         <developer>
@@ -356,6 +358,8 @@
                                     <url>https://s3-us-west-2.amazonaws.com/dynamodb-local/dynamodb_local_latest.zip</url>
                                     <unpack>true</unpack>
                                     <outputDirectory>${project.build.directory}/dynamodb</outputDirectory>
+				    <skipCache>${download.skip.cache}</skipCache>
+				    <overwrite>${download.force.overwrite}</overwrite>
                                 </configuration>
                             </execution>
                         </executions>
@@ -446,8 +450,8 @@
                                     <url>https://github.com/JanusGraph/janusgraph/releases/download/v${janusgraph.version}/janusgraph-${janusgraph.version}-hadoop2.zip</url>
                                     <unpack>false</unpack>
 				    <outputDirectory>${project.build.directory}/../server</outputDirectory>
-				    <skipCache>true</skipCache>
-				    <overwrite>true</overwrite>
+				    <skipCache>${download.skip.cache}</skipCache>
+				    <overwrite>${download.force.overwrite}</overwrite>
                                 </configuration>
                             </execution>
                         </executions>
@@ -473,6 +477,8 @@
                                     <url>https://s3-us-west-2.amazonaws.com/dynamodb-local/dynamodb_local_latest.zip</url>
                                     <unpack>true</unpack>
                                     <outputDirectory>${project.build.directory}/dynamodb</outputDirectory>
+				    <skipCache>${download.skip.cache}</skipCache>
+				    <overwrite>${download.force.overwrite}</overwrite>
                                 </configuration>
                             </execution>
                         </executions>

src/test/resources/install-gremlin-server.sh

@@ -16,9 +16,38 @@ set -eu
 # permissions and limitations under the License.
 #
 
+usage() {
+    echo "Usage: $0 [options]" >&2
+    echo "Options:" >&2
+    echo " -f      force overwriting of the cached files" >&2
+}
+
+MVN_OPT_PARAMS=""
+
+args=$(getopt fh $*)
+if [ $? != 0 ] ; then
+    usage
+    exit 1
+fi
+
+set -- $args
+
+for i ; do
+    case "$i" in
+        -f)
+            MVN_OPT_PARAMS="$MVN_OPT_PARAMS -Ddownload.skip.cache=true -Ddownload.force.overwrite=true"
+            shift;;
+        -h)
+            usage
+            exit 0;;
+        --)
+            shift; break;;
+    esac
+done
+
 #collect the prereqs and build the plugin
 export MAVEN_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
-mvn -q -T 1C install -Dmaven.test.skip=true -DskipTests=true
+mvn -q -T 1C install -Dmaven.test.skip=true -DskipTests=true $MVN_OPT_PARAMS
 
 # Directory structure of server directory
 # -src
@@ -35,12 +64,12 @@ mvn -q -T 1C install -Dmaven.test.skip=true -DskipTests=true
 # |-dependencies
 # |
 
-export ARTIFACT_NAME=`mvn -q -Dexec.executable="echo" -Dexec.args='${project.artifactId}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec`
+export ARTIFACT_NAME=`mvn -q -Dexec.executable="echo" -Dexec.args='${project.artifactId}' $MVN_OPT_PARAMS --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec`
 export JANUSGRAPH_DYNAMODB_HOME=${PWD}
 export JANUSGRAPH_DYNAMODB_TARGET=${JANUSGRAPH_DYNAMODB_HOME}/target
-export JANUSGRAPH_VERSION=`mvn -q -Dexec.executable="echo" -Dexec.args='${janusgraph.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec`
+export JANUSGRAPH_VERSION=`mvn -q -Dexec.executable="echo" -Dexec.args='${janusgraph.version}' $MVN_OPT_PARAMS --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec`
 #Extract the DYNAMODB version from the pom.
-export DYNAMODB_PLUGIN_VERSION=`mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec`
+export DYNAMODB_PLUGIN_VERSION=`mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' $MVN_OPT_PARAMS --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec`
 export JANUSGRAPH_VANILLA_SERVER_DIRNAME=janusgraph-${JANUSGRAPH_VERSION}-hadoop2
 export JANUSGRAPH_VANILLA_SERVER_ZIP=${JANUSGRAPH_VANILLA_SERVER_DIRNAME}.zip
 export JANUSGRAPH_DYNAMODB_SERVER_DIRNAME=${ARTIFACT_NAME}-${DYNAMODB_PLUGIN_VERSION}
@@ -65,7 +94,7 @@ export JANUSGRAPH_SERVER_SERVICE_SH=${JANUSGRAPH_SERVER_BIN}/gremlin-server-serv
 mkdir -p ${WORKDIR}
 
 #download the server products
-mvn test -q -Pdownload-janusgraph-server-zip > /dev/null 2>&1
+mvn test -q -Pdownload-janusgraph-server-zip $MVN_OPT_PARAMS > /dev/null 2>&1
 
 #verify
 pushd target