JAL-3332 Sensible default timeout values for network connections (8s connect_timeout...

[jalview.git] / getdown / src / getdown / mvn_cmd

diff --git a/getdown/src/getdown/mvn_cmd b/getdown/src/getdown/mvn_cmd
index 2e80990..fd7c716 100755 (executable)
--- a/getdown/src/getdown/mvn_cmd
+++ b/getdown/src/getdown/mvn_cmd
@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 
-export VERSION=1.8.3-1.0_JVL
+if [ x$JVLVERSION != x ]; then
+  export VERSION=$JVLVERSION
+else
+  export VERSION=1.8.3-1.1.4_JVL
+fi
 
 if [ x${VERSION%_JVL} = x$VERSION ]; then
   VERSION=${VERSION}_JVL
@@ -10,11 +14,11 @@ echo "Setting VERSION to '$VERSION'"
 
 perl -p -i -e 's|(<version>)[^<]*JVL[^<]*(</version>)|${1}$ENV{VERSION}${2}|;' pom.xml */pom.xml
 
-mvn clean package -Dgetdown.host.whitelist="jalview.org,*.jalview.org"
+mvn package -Dgetdown.host.whitelist="jalview.org,*.jalview.org" -Dconnect_timeout=8 -Dread_timeout=15
 RET=$?
 if [ x$RET = x0 ]; then
-  cp launcher/target/getdown-launcher-$VERSION.jar ../../../getdown/lib/getdown-launcher.jar
-  cp core/target/getdown-core-$VERSION.jar ../../../getdown/lib/getdown-core.jar
-  cp core/target/getdown-core-$VERSION.jar ../../../j8lib/getdown-core.jar
-  cp core/target/getdown-core-$VERSION.jar ../../../j11lib/getdown-core.jar 
+  cp launcher/target/getdown-launcher-$VERSION.jar ../../../getdown/lib/getdown-launcher.jar && echo "Copied getdown-launcher.jar to getdown/lib"
+  cp core/target/getdown-core-$VERSION.jar ../../../getdown/lib/getdown-core.jar && echo "Copied getdown-core.jar to getdown/lib"
+  cp core/target/getdown-core-$VERSION.jar ../../../j8lib/getdown-core.jar && echo "Copied getdown-core.jar to j8lib"
+  cp core/target/getdown-core-$VERSION.jar ../../../j11lib/getdown-core.jar && echo "Copied getdown-core.jar to j11lib"
 fi