git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'improvement/JAL-3394_added_categories_to_unix_shell_installer_desktop_f...
[jalview.git]
/
gradle.properties
diff --git
a/gradle.properties
b/gradle.properties
index
74685aa
..
9c6832a
100644
(file)
--- a/
gradle.properties
+++ b/
gradle.properties
@@
-1,3
+1,5
@@
+org.gradle.jvmargs=-Xmx1536m -Xms512m
+
jalviewDir = .
#JAVA_VERSION = 1.8
jalviewDir = .
#JAVA_VERSION = 1.8
@@
-22,6
+24,7
@@
jalview_keyalg = SHA1withRSA
jalview_keydig = SHA1
testngGroups = Functional
jalview_keydig = SHA1
testngGroups = Functional
+testngExcludedGroups =
j8libDir = j8lib
j11libDir = j11lib
j8libDir = j8lib
j11libDir = j11lib
@@
-145,7
+148,7
@@
bamboo_channelbase = https://builds.jalview.org/browse
bamboo_planKey =
bamboo_getdown_channel_suffix = /latest/artifact/shared/getdown-channel
bamboo_planKey =
bamboo_getdown_channel_suffix = /latest/artifact/shared/getdown-channel
-eclipse_extra_jdt_prefs_file = .settings/org.eclipse.jdt.core.jalview.prefs
+eclipse_extra_jdt_prefs_file = utils/eclipse/org.eclipse.jdt.core.jalview.prefs
eclipse_project_name = jalview
eclipse_bin_dir = bin
eclipse_debug = false
eclipse_project_name = jalview
eclipse_bin_dir = bin
eclipse_debug = false