From: Ben Soares <b.soares@dundee.ac.uk>
Date: Mon, 28 Sep 2020 11:12:47 +0000 (+0100)
Subject: Merge branch 'develop' into bug/JAL-3753_resources_duplicated_in_jalview_jar
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~1
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=2d1798c357c64064590a4206e944b740b0539435;hp=aa7e98db16b72e10b09e8897a382e5cbb5ca0012

Merge branch 'develop' into bug/JAL-3753_resources_duplicated_in_jalview_jar
---

diff --git a/build.gradle b/build.gradle
index 072a7b4..789aaea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -111,7 +111,7 @@ ext {
   }
   ////
   // Set JALVIEW_VERSION if it is not already set
-  if (findProperty(JALVIEW_VERSION)==null || "".equals(JALVIEW_VERSION)) {
+  if (findProperty("JALVIEW_VERSION")==null || "".equals(JALVIEW_VERSION)) {
     JALVIEW_VERSION = releaseProps.get("jalview.version")
   }
   
diff --git a/gradle.properties b/gradle.properties
index 16fe32f..75d2c46 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,8 @@ source_dir = src
 test_source_dir = test
 #test_source_dir = utils/jalviewjs/test/test
 
-JALVIEW_VERSION = DEVELOPMENT
+# JALVIEW_VERSION now being set by logic in build.gradle defaulting to looking at jalview.version property in RELEASE file
+#JALVIEW_VERSION = DEVELOPMENT
 INSTALLATION = Source
 jalview_keystore = keys/.keystore
 jalview_keystore.pass = alignmentisfun