JAL-3280 fixes after CR-JAL-241. Now only checking release build_properties.

diff --git a/build.gradle b/build.gradle
index 66b5550..49d34fe 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -1365,8 +1365,10 @@ task getdownWebsite() {
     //getdownTextString += "class = " + file(getdownLauncher).getName() + "\n"
     getdownTextString += "resource = ${getdown_launcher_new}\n"
     getdownTextString += "class = ${main_class}\n"
-    getdownTextString += "jvmarg = -Dgetdowndistdir=${getdownAppDistDir}\n"
-    getdownTextString += "jvmarg = -Dgetdownappbase=${getdownAppBase}\n"
+    /* NOT setting these properties so that getdownappbase and getdowndistdir will default to release version
+     * getdownTextString += "jvmarg = -Dgetdowndistdir=${getdownAppDistDir}\n"
+     * getdownTextString += "jvmarg = -Dgetdownappbase=${getdownAppBase}\n"
+     */
 
     def getdown_txt = file("${getdownWebsiteDir}/getdown.txt")
     getdown_txt.write(getdownTextString)

diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index 162ed3c..3a170ec 100755 (executable)
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -483,7 +483,6 @@ public class Cache
             Properties remoteBuildProperties = new Properties();
             remoteBuildProperties.load(in);
             remoteVersion = remoteBuildProperties.getProperty("VERSION");
-            remoteBuildProperties.load(in);
           } catch (Exception ex)
           {
             System.out
@@ -496,7 +495,6 @@ public class Cache
                   orgtimeout);
 
           setProperty("LATEST_VERSION", remoteVersion);
-          System.out.println("LATEST_VERSION=" + remoteVersion);
         }
       }